Debian stable supports this feature now. 🎉
@ -74,9 +74,7 @@
[log]
follow = true
[merge]
# TODO: Switch this to the even better "zdiff3" (zealous diff3) setting once
# git 2.35 is available in Debian stable
conflictstyle = diff3
conflictstyle = zdiff3
[notes]
displayRef = refs/notes/*
[pager]