Merge branch 'rt/doc-merge-file-diff3'

* rt/doc-merge-file-diff3:
Documentation/git-merge-file: document option "--diff3"

diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index d7db2a3737fbdb032747bc6dd2740be1a56dfced..d2fc12ec77b85a5c9457cbfa160e5c05c1a32f43 100644 (file)
--- 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::