From 23e51046d87dd04d2169b4253979343b0bfd4bd2 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Sun, 14 Nov 2021 06:46:57 -0700
Subject: [PATCH] trying out ediff for mergeing

---
 .gitconfig | 5 +++++
 1 file changed, 5 insertions(+)

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\\\")\"