diff options
Diffstat (limited to 'Documentation/git-switch.txt')
| -rw-r--r-- | Documentation/git-switch.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt index 96dc036ea5..bbcbdceb45 100644 --- 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:: |