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