| commit | ddfc44a898a58311392a5329687a1813d6b94779 | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 1 Dec 2021 00:05:07 +0000 (1 00:05 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 1 Dec 2021 22:45:59 +0000 (1 14:45 -0800) | ||
| tree | b264cec304adc063f1f186bd799bebacc03edf53 | treesnapshot (tar.gz zip) |
| parent | 4496526f80b3e4952036550b279eff8d1babd60a | commitdiff |
update documentation for new zdiff3 conflictStyle
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>