qbit/dotconf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trying out ediff for mergeing

Browse Source
This commit is contained in:
Aaron Bieber 2021-11-14 06:46:57 -07:00
parent 05398da385
commit 23e51046d8
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitconfig
View File

@ -57,3 +57,8 @@
[init] [init]
defaultBranch = main defaultBranch = main
[merge]
tool = ediff
[mergetool "ediff"]
cmd = emacsclient -c -a \"\" --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"