From ddfc44a898a58311392a5329687a1813d6b94779 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Wed, 1 Dec 2021 00:05:07 +0000 Subject: update documentation for new zdiff3 conflictStyle Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- Documentation/git-checkout.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Documentation/git-checkout.txt') 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:: -- cgit v1.3