diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-03-20 20:59:31 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-03-20 20:59:31 +0000 |
| commit | 0299d92c0447b72142f40f7b12f912d028b61c53 (patch) | |
| tree | d1db2bd61bcc566ea8b856c9896ee8adb331055b /git-merge-file.txt | |
| parent | afb395b595f0a5b54d84d0d6633628218e610f57 (diff) | |
| download | git-htmldocs-0299d92c0447b72142f40f7b12f912d028b61c53.tar.gz | |
Autogenerated HTML docs for v1.7.0.2-323-g0d09
Diffstat (limited to 'git-merge-file.txt')
| -rw-r--r-- | git-merge-file.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/git-merge-file.txt b/git-merge-file.txt index 234269ae5..f334d694e 100644 --- a/git-merge-file.txt +++ b/git-merge-file.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]] - [--ours|--theirs] [-p|--stdout] [-q|--quiet] + [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>] <current-file> <base-file> <other-file> @@ -35,9 +35,10 @@ normally outputs a warning and brackets the conflict with lines containing >>>>>>> B If there are conflicts, the user should edit the result and delete one of -the alternatives. When `--ours` or `--theirs` option is in effect, however, -these conflicts are resolved favouring lines from `<current-file>` or -lines from `<other-file>` respectively. +the alternatives. When `--ours`, `--theirs`, or `--union` option is in effect, +however, these conflicts are resolved favouring lines from `<current-file>`, +lines from `<other-file>`, or lines from both respectively. The length of the +conflict markers can be given with the `--marker-size` option. The exit value of this program is negative on error, and the number of conflicts otherwise. If the merge was clean, the exit value is 0. @@ -67,8 +68,9 @@ OPTIONS --ours:: --theirs:: +--union:: Instead of leaving conflicts in the file, resolve conflicts - favouring our (or their) side of the lines. + favouring our (or their or both) side of the lines. EXAMPLES |