Skip to content

Instantly share code, notes, and snippets.

@roolo
Created October 21, 2011 14:39
Show Gist options
  • Save roolo/1304005 to your computer and use it in GitHub Desktop.
Save roolo/1304005 to your computer and use it in GitHub Desktop.
git-merge with KDiff3 on Mac OS X Lion
# This is file ~/.gitconfig
[merge]
tool = extMerge
[mergetool "extMerge"]
cmd = ~/bin/extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
#!/bin/sh
# This is file ~/bin/extMerge.sh
/Applications/kdiff3.app/Contents/MacOS/kdiff3 $*
@JourneyOn
Copy link

cmd = ~/bin/extMerge -> cmd = ~/bin/extMerge.sh

run
chmod +x ~/bin/extMerge.sh

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment