diff options
| author |  Ralf Thielow <ralf.thielow@gmail.com> | 2013-08-09 20:09:32 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-08-09 14:19:59 -0700 |
| commit | 67ed84f3e25db8e81dd905dbe275bbcd37afb543 (patch) | |
| tree | 54dfb7d45c5066bb8858f4155cab68f94712c6f9 /Documentation | |
| parent | parse-options: fix clang opterror() -Wunused-value warning (diff) | |
| download | tgif-67ed84f3e25db8e81dd905dbe275bbcd37afb543.tar.xz | |
Documentation/git-merge-file: document option "--diff3"
The option "--diff3" was added to "git merge-file" in e0af48e
(xdiff-merge: optionally show conflicts in "diff3 -m" style)
but it was never documented in "Documentation/git-merge-file.txt".
Add documentation for this option.
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-merge-file.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt index d7db2a3737..d2fc12ec77 100644 --- a/Documentation/git-merge-file.txt +++ b/Documentation/git-merge-file.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]] [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>] - <current-file> <base-file> <other-file> + [--[no-]diff3] <current-file> <base-file> <other-file> DESCRIPTION @@ -66,6 +66,9 @@ OPTIONS -q:: Quiet; do not warn about conflicts. +--diff3:: + Show conflicts in "diff3" style. + --ours:: --theirs:: --union:: |