These files are based on guide from http://progit.org/book/ch7-1.html and KDiff3 parameters documentation form http://kdiff3.sourceforge.net/doc/documentation.html. Testing repo can be found here https://github.com/roolo/merge-with-conflict
Created
October 21, 2011 14:39
-
-
Save roolo/1304005 to your computer and use it in GitHub Desktop.
git-merge with KDiff3 on Mac OS X Lion
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # This is file ~/.gitconfig | |
| [merge] | |
| tool = extMerge | |
| [mergetool "extMerge"] | |
| cmd = ~/bin/extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #!/bin/sh | |
| # This is file ~/bin/extMerge.sh | |
| /Applications/kdiff3.app/Contents/MacOS/kdiff3 $* |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
cmd = ~/bin/extMerge -> cmd = ~/bin/extMerge.sh
run
chmod +x ~/bin/extMerge.sh