diff --git a/gitconfig b/gitconfig index 12672fa6..b840cfaf 100644 --- a/gitconfig +++ b/gitconfig @@ -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]