]> git.99rst.org Git - git.git/commit
update documentation for new zdiff3 conflictStyle
authorElijah Newren <redacted>
Wed, 1 Dec 2021 00:05:07 +0000 (00:05 +0000)
committerJunio C Hamano <redacted>
Wed, 1 Dec 2021 22:45:59 +0000 (14:45 -0800)
commitddfc44a898a58311392a5329687a1813d6b94779
treeb264cec304adc063f1f186bd799bebacc03edf53
parent4496526f80b3e4952036550b279eff8d1babd60a
update documentation for new zdiff3 conflictStyle

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/config/merge.txt
Documentation/git-checkout.txt
Documentation/git-merge-file.txt
Documentation/git-merge.txt
Documentation/git-rebase.txt
Documentation/git-restore.txt
Documentation/git-switch.txt
Documentation/technical/rerere.txt
builtin/checkout.c
git clone https://git.99rst.org/PROJECT