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

gitconfig: Fix whitespace

Browse source
This commit is contained in:
Henrik Lissner 2015-09-06 19:56:14 -04:00
parent 1a05d9e340
commit 986cb8ead4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gitconfig
View file

@ -22,7 +22,7 @@
log = true
tool = ediff
[mergetool "ediff"]
cmd = emacsclient -c -a \"\" --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"
cmd = emacsclient -c -a \"\" --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"
[push]
default = simple
[credential]