From 93bcdefeb78234c8d001132e4686b491936cb9da Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 20 Jun 2015 10:24:30 +0200
Subject: [PATCH] gitconfig: mergetool=ediff

---
 gitconfig | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gitconfig b/gitconfig
index 54db6a99..12672fa6 100644
--- a/gitconfig
+++ b/gitconfig
@@ -20,7 +20,9 @@
 [merge]
 	# Include summaries of merged commits in newly created merge commit messages
 	log = true
-	tool = vimdiff
+	tool = ediff
+[mergetool "ediff"]
+  cmd = emacsclient -c -a \"\"  --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"
 [push]
 	default = simple
 [credential]