The latest versions of Git have built-in support for kdiff3 , so there is no need to configure it manually using the common cmd and args settings. Instead, run:
$ git config --global merge.tool kdiff3
And if kdiff3 not in your PATH environment, follow these steps:
$ git config --global mergetool.kdiff3.path /Applications/kdiff3.app/Contents/MacOS/kdiff3
This makes git mergetool kdiff3 . Please note that there is no way to configure Git to automatically launch your merge tool after manually merging with conflicts.
If you really want to see how Git calls kdiff3 internally, check out the mergetool built-in configuration for kdiff3 .
Change For Beyond Compare 4 , which now also supports Mac OS X, just exchange kdiff3 for bc3 (yes, "3") and adjust the path in the lines above. Starting with Git 2.2.0, you can use bc as an alias for bc3 so you don't have to worry about the version number.
sschuberth Jan 16 '13 at 13:21 2013-01-16 13:21
source share