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

* rt/doc-merge-file-diff3: Documentation/git-merge-file: document option "--diff3"
git-mirror · Aug 30, 2013 · 482bd22 · 482bd22
2 parents 04d0eb8 + 67ed84f
commit 482bd22
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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::