Merge branch 'en/zdiff3'
"Zealous diff3" style of merge conflict presentation has been added. * en/zdiff3: update documentation for new zdiff3 conflictStyle xdiff: implement a zealous diff3, or "zdiff3"
Junio C Hamano committed
Dec 15, 2021 at 09:39 UTC
4ce498baa3976cf96d3feb4215a486dd47ec2e7b
No changes.