Skip to content

Instantly share code, notes, and snippets.

@caldwell

caldwell/.gitconfig

Created February 25, 2013 01:26
Show Gist options
  • Save caldwell/5026722 to your computer and use it in GitHub Desktop.
Save caldwell/5026722 to your computer and use it in GitHub Desktop.
Download ZIP
Add these config lines to your .gitconfig to use emacs's ediff as git's mergetool.
Raw
.gitconfig
[merge]
tool = ediff
[mergetool "ediff"]
cmd = emacs --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment