diff options
| author |  Bert Wesarg <bert.wesarg@googlemail.com> | 2010-03-01 22:46:27 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-02 21:16:44 -0800 |
| commit | 11f3aa2305426d11945c72479d24a15d30768d50 (patch) | |
| tree | a387ab1883e3e0f007ab306217972dde4306f98f /Documentation/git-merge-file.txt | |
| parent | refactor merge flags into xmparam_t (diff) | |
| download | tgif-11f3aa2305426d11945c72479d24a15d30768d50.tar.xz | |
merge-file: add option to specify the marker size
This adds the abbility to specify the conflict marker size for merges outside
a git repository.
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
| -rw-r--r-- | Documentation/git-merge-file.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt index 234269ae59..a5b9c1f6c8 100644 --- a/Documentation/git-merge-file.txt +++ b/Documentation/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] [-p|--stdout] [-q|--quiet] [--marker-size=<n>] <current-file> <base-file> <other-file> @@ -37,7 +37,8 @@ normally outputs a warning and brackets the conflict with lines containing 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. +lines from `<other-file>` 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. |