Merge branch 'js/branch-track-inherit'

[thirdparty/git.git] / Documentation / git-switch.txt

diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt
index 96dc036ea5ae26fe4ce306a542e86b71af3b10ff..bbcbdceb459c2828e0eb46110d038137be1f6f92 100644 (file)
--- a/Documentation/git-switch.txt
+++ b/Documentation/git-switch.txt
@@ -137,8 +137,7 @@ should result in deletion of the path).
        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".
 
 -q::
 --quiet::