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

vcs/git/.gitconfig: ediff = emacsclient -c instead of -n

Browse source
This commit is contained in:
Henrik Lissner 2017-03-19 01:28:27 -04:00
parent af0da0ddda
commit e5325b9db2
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vcs/git/.gitconfig
View file

@ -18,7 +18,7 @@
prompt = false prompt = false
cmd = vimdiff \"$LOCAL\" \"$REMOTE\" cmd = vimdiff \"$LOCAL\" \"$REMOTE\"
[difftool "ediff"] [difftool "ediff"]
cmd = emacsclient -n --eval \"(ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\")\" cmd = emacsclient -c --eval \"(ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\")\"
[merge] [merge]
# Include summaries of merged commits in newly created merge commit messages # Include summaries of merged commits in newly created merge commit messages