diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-15 13:00:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-15 13:00:31 -0800 |
| commit | 2b15318a963a036b7d9b73e538c5ca566fec9794 (patch) | |
| tree | aee21ed0152eb1aefc8e8e2420de58a251d45b4b /git-checkout.txt | |
| parent | 59a32b07d3e226cad19135aee37bf81c8849efc8 (diff) | |
| download | git-htmldocs-2b15318a963a036b7d9b73e538c5ca566fec9794.tar.gz | |
Autogenerated HTML docs for v2.34.1-297-g69a9c1
Diffstat (limited to 'git-checkout.txt')
| -rw-r--r-- | git-checkout.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-checkout.txt b/git-checkout.txt index a52dc49a3..c497db7ea 100644 --- a/git-checkout.txt +++ b/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:: |