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>
Ralf Thielow committed
Aug 9, 2013 at 20:09 UTC
67ed84f3e25db8e81dd905dbe275bbcd37afb543
1 file changed
+4
-1
Documentation/git-merge-file.txt
+4
-1
@@ -11,7 +11,7 @@ SYNOPSIS
11
[verse]
12
'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]]
13
[--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>]
14
- <current-file> <base-file> <other-file>
14
+ [--[no-]diff3] <current-file> <base-file> <other-file>
15
16
17
DESCRIPTION
@@ -66,6 +66,9 @@ OPTIONS
66
-q::
67
Quiet; do not warn about conflicts.
68
69
+--diff3::
70
+ Show conflicts in "diff3" style.
71
+
72
--ours::
73
--theirs::
74
--union::