From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Dec 2021 17:39:47 +0000 (-0800)
Subject: Merge branch 'en/zdiff3'
X-Git-Tag: v2.35.0-rc0~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ce498baa3976cf96d3feb4215a486dd47ec2e7b;p=thirdparty%2Fgit.git

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"
---

4ce498baa3976cf96d3feb4215a486dd47ec2e7b