From e5325b9db227056f416d0d4807dc35606569fc2e Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 19 Mar 2017 01:28:27 -0400
Subject: [PATCH] vcs/git/.gitconfig: ediff = emacsclient -c instead of -n

---
 vcs/git/.gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vcs/git/.gitconfig b/vcs/git/.gitconfig
index cfd4a7fb..79386539 100644
--- a/vcs/git/.gitconfig
+++ b/vcs/git/.gitconfig
@@ -18,7 +18,7 @@
 	prompt = false
 	cmd = vimdiff \"$LOCAL\" \"$REMOTE\"
 [difftool "ediff"]
-	cmd = emacsclient -n --eval \"(ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\")\"
+	cmd = emacsclient -c --eval \"(ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\")\"
 
 [merge]
 	# Include summaries of merged commits in newly created merge commit messages