gitconfig disable diff3

2025-09-10 21:25:47 +02:00
parent 965e5a16f9
commit 517d0111aa
1 changed files with 2 additions and 2 deletions
@@ -13,8 +13,8 @@
    required = true
 [interactive]
    diffFilter = delta --color-only
-[merge]
-    conflictstyle = diff3
+; [merge]
+;     conflictstyle = diff3
 [delta]
    navigate = true
    light = false