From 986cb8ead42e26d157b9e16316e6fecb6e5944d7 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 6 Sep 2015 19:56:14 -0400 Subject: [PATCH] gitconfig: Fix whitespace --- gitconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]