diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-08-30 10:08:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-30 10:08:23 -0700 |
| commit | 482bd22d4985d605e7778c0e9ee21c65891f2b55 (patch) | |
| tree | 4936e140567b33abf97b8021f3877701ea33aae9 /Documentation | |
| parent | 04d0eb89e3e3a5ff5a3b656a35f7c4b9a5608b16 (diff) | |
| parent | 67ed84f3e25db8e81dd905dbe275bbcd37afb543 (diff) | |
| download | git-482bd22d4985d605e7778c0e9ee21c65891f2b55.tar.gz | |
Merge branch 'rt/doc-merge-file-diff3'
* rt/doc-merge-file-diff3:
Documentation/git-merge-file: document option "--diff3"
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:: |