Last active
November 22, 2020 20:21
-
-
Save caldwell/5026687 to your computer and use it in GitHub Desktop.
~/.gitconfig snippet for using Emacs ediff with git mergetool via emacsclient.
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
| [merge] | |
| tool = ediff | |
| [mergetool "ediff"] | |
| cmd = emacsclient -c -a \"\" --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