development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-18 07:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
* rt/doc-merge-file-diff3:
  Documentation/git-merge-file: document option "--diff3"
This commit is contained in:
Junio C Hamano 2013-08-30 10:08:23 -07:00
parent 04d0eb89e3 67ed84f3e2
commit 482bd22d49
1 changed files with 4 additions and 1 deletions
Show stats 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]
'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::