mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation/git-merge-file: document option "--diff3"

Browse Source 
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>
This commit is contained in:
Ralf Thielow
2013-08-09 20:09:32 +02:00
committed by Junio C Hamano
parent a3bc3d070c
commit 67ed84f3e2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-merge-file.txt
View File

@ -11,7 +11,7 @@ SYNOPSIS
[verse] [verse]
'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]] 'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]]
[--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>] [--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 DESCRIPTION
@ -66,6 +66,9 @@ OPTIONS
-q:: -q::
Quiet; do not warn about conflicts. Quiet; do not warn about conflicts.
--diff3::
Show conflicts in "diff3" style.
--ours:: --ours::
--theirs:: --theirs::
--union:: --union::