Set Diffmerge as Diff/Merge tool for Git

From the command line run each of these. You don’t need to be in particular directory.

Thus will work for *nix flavours including OSX. May not work on Window boxes or flower beds.

Now, whenever you want it to launch diffs just use difftool where you’d normally use diff:

N.B. These commands need to be run from the relevant directory for the project

To resolve merge conflicts, just run git mergetool:

http://twobitlabs.com/2011/08/install-diffmerge-git-mac-os-x/

 

Leave a Reply

Your e-mail address will not be published. Required fields are marked *