Comment by asfaltboy

@jskinner can we run the 3-way merge tool from command line, i.e to set it as a `git mergetool` ?