diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-15 17:39:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-15 17:39:47 (GMT) |
| commit | 4ce498baa3976cf96d3feb4215a486dd47ec2e7b (patch) | |
| tree | 6461c3669e41cebaf33f124d5964c06072803187 /Documentation/git-checkout.txt | |
| parent | 62329d336f5d427d8f08035798bf62cd7d8fd847 (diff) | |
| parent | ddfc44a898a58311392a5329687a1813d6b94779 (diff) | |
| download | git-4ce498baa3976cf96d3feb4215a486dd47ec2e7b.zip git-4ce498baa3976cf96d3feb4215a486dd47ec2e7b.tar.gz git-4ce498baa3976cf96d3feb4215a486dd47ec2e7b.tar.bz2 | |
Merge branch 'en/zdiff3'
"Zealous diff3" style of merge conflict presentation has been added.
* en/zdiff3:
update documentation for new zdiff3 conflictStyle
xdiff: implement a zealous diff3, or "zdiff3"
Diffstat (limited to 'Documentation/git-checkout.txt')
| -rw-r--r-- | Documentation/git-checkout.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index a52dc49..c497db7 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:: |