Switch to diff3 for merge conflict style

zdiff3 is only available from git 2.35 onwards. Modern versions of Ubuntu have an older version of git, making it incompatible.
MrPickles · Mar 21, 2024 · 20450e6 · 20450e6
1 parent b7dfbe1
commit 20450e6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/home/main.gitconfig b/home/main.gitconfig
@@ -29,7 +29,7 @@
 [interactive]
 	diffFilter = delta --color-only
 [merge]
-  conflictstyle = zdiff3
+  conflictstyle = diff3
 [commit]
   verbose = true
 [diff]