diff options
| author | Elijah Newren <newren@gmail.com> | 2021-12-01 00:05:07 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-01 14:45:59 -0800 |
| commit | ddfc44a898a58311392a5329687a1813d6b94779 (patch) | |
| tree | b264cec304adc063f1f186bd799bebacc03edf53 /Documentation/git-switch.txt | |
| parent | 4496526f80b3e4952036550b279eff8d1babd60a (diff) | |
| download | git-ddfc44a898a58311392a5329687a1813d6b94779.tar.gz | |
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-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 5c438cd505..5c90f76fbe 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:: |