diff --git a/.gitconfig b/.gitconfig
index c7df51c..415c5f7 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -57,3 +57,8 @@
 
 [init]
 	defaultBranch = main
+
+[merge]
+	tool = ediff
+[mergetool "ediff"]
+	cmd = emacsclient -c -a \"\"  --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"