Change git config diff mode to zdiff3

Debian stable supports this feature now. 🎉
9 months ago · 4619c677ab
parent c438b48631
commit 4619c677ab
1 changed files with 1 additions and 3 deletions
--- a/src/.gitconfig
+++ b/src/.gitconfig
@ -74,9 +74,7 @@
 [log]
 	follow = true
 [merge]
-	# TODO: Switch this to the even better "zdiff3" (zealous diff3) setting once
+	conflictstyle = zdiff3
 	# git 2.35 is available in Debian stable
 	conflictstyle = diff3
 [notes]
 	displayRef = refs/notes/*
 [pager]