Git on Windows: How do you set up a mergetool?
To follow-up on Charles Bailey’s answer, here’s my git setup that’s using p4merge (free cross-platform 3way merge tool); tested on msys Git (Windows) install: git config –global merge.tool p4merge git config –global mergetool.p4merge.cmd ‘p4merge.exe \”$BASE\” \”$LOCAL\” \”$REMOTE\” \”$MERGED\”‘ or, from a windows cmd.exe shell, the second line becomes : git config –global mergetool.p4merge.cmd “p4merge.exe \”$BASE\” … Read more