Narven
12/7/2015 - 7:57 PM

Add these config lines to your .gitconfig to use emacs's ediff as git's mergetool.

Add these config lines to your .gitconfig to use emacs's ediff as git's mergetool.

.gitconfig
content_copyfile_download
[merge]
        tool = ediff
[mergetool "ediff"]
        cmd = emacs --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"