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]