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-merge-file.txt | |
| parent | 59a32b07d3e226cad19135aee37bf81c8849efc8 (diff) | |
| download | git-htmldocs-2b15318a963a036b7d9b73e538c5ca566fec9794.tar.gz | |
Autogenerated HTML docs for v2.34.1-297-g69a9c1
Diffstat (limited to 'git-merge-file.txt')
| -rw-r--r-- | git-merge-file.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-merge-file.txt b/git-merge-file.txt index f85603261..7e9093fab 100644 --- a/git-merge-file.txt +++ b/git-merge-file.txt @@ -70,6 +70,9 @@ OPTIONS --diff3:: Show conflicts in "diff3" style. +--zdiff3:: + Show conflicts in "zdiff3" style. + --ours:: --theirs:: --union:: |