trying out ediff for mergeing

2021-11-14 06:46:57 -07:00 · 2021-11-14 06:46:57 -07:00 · 23e51046d8
commit 23e51046d8
parent 05398da385
1 changed files with 5 additions and 0 deletions
--- 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\\\")\"