https://ductile.systems/zdiff3/

diff --git a/.gitconfig b/.gitconfig
index 81b6c50d..b39acb4d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -44,7 +44,7 @@
 [apply]
 	whitespace = warn
 [merge]
-	conflictstyle = diff3
+	conflictstyle = zdiff3
 	ff = false
 	tool = vimdiff
 [mergetool "vimdiff"]