merge.conflictstyle zdiff3

https://ductile.systems/zdiff3/
7 months ago · ca433a0eca
parent c420241544
commit ca433a0eca
1 changed files with 1 additions and 1 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -44,7 +44,7 @@
 [apply]
 	whitespace = warn
 [merge]
-	conflictstyle = diff3
+	conflictstyle = zdiff3
 	ff = false
 	tool = vimdiff
 [mergetool "vimdiff"]