aynish/helm
1
0
Fork 0
Code Pull requests Packages Projects Releases Activity

gitconfig: mergetool=ediff

Browse source
This commit is contained in:
Henrik Lissner 2015-06-20 10:24:30 +02:00
parent 1e2b3304ab
commit 93bcdefeb7
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gitconfig
View file

@ -20,7 +20,9 @@
[merge] [merge]
# Include summaries of merged commits in newly created merge commit messages # Include summaries of merged commits in newly created merge commit messages
log = true log = true
tool = vimdiff tool = ediff
[mergetool "ediff"]
cmd = emacsclient -c -a \"\" --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"
[push] [push]
default = simple default = simple
[credential] [credential]