dblume commited on 2022-12-15 01:09:23 Showing 1 changed files, with 1 additions and 0 deletions.
@@ -25,5 +25,6 @@
prune = true
[merge]
tool = vimdiff
+ conflictstyle = diff3
[include]
path = ~/.gitconfig.local