summaryrefslogtreecommitdiffstats
path: root/Documentation/git-checkout.txt
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2021-12-01 01:05:07 +0100
committerJunio C Hamano <gitster@pobox.com>2021-12-01 23:45:59 +0100
commitddfc44a898a58311392a5329687a1813d6b94779 (patch)
treeb264cec304adc063f1f186bd799bebacc03edf53 /Documentation/git-checkout.txt
parentxdiff: implement a zealous diff3, or "zdiff3" (diff)
downloadgit-ddfc44a898a58311392a5329687a1813d6b94779.tar.xz
git-ddfc44a898a58311392a5329687a1813d6b94779.zip
update documentation for new zdiff3 conflictStyle
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-checkout.txt')
-rw-r--r--Documentation/git-checkout.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index d473c9bf38..00e62031be 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -266,8 +266,7 @@ When switching branches with `--merge`, staged changes may be lost.
The same as `--merge` option above, but changes the way the
conflicting hunks are presented, overriding the
`merge.conflictStyle` configuration variable. Possible values are
- "merge" (default) and "diff3" (in addition to what is shown by
- "merge" style, shows the original contents).
+ "merge" (default), "diff3", and "zdiff3".
-p::
--patch::