chore(git): use zdiff3 conflict style for cleaner diffs

2026-09-24 15:59:47 -04:00
parent 8086430934
commit e7b19ee993
1 changed files with 1 additions and 1 deletions
@@ -53,7 +53,7 @@ pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(
 layout = BASE,MERGED + BASE,LOCAL + BASE,REMOTE

 [merge]
-conflictStyle = diff3
+conflictStyle = zdiff3
 summary = true
 verbosity = 1
 tool = nvimdiff