Bert WesargSigned-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---
This can probably improved in a way, that the marker size will be taken from attributes. This could be done by an explicit --marker-size-by-path option or an option which names one of the three input files as a git path.
For example:
$ echo "foo conflict-marker-size=32" > .gitattributes $ git merge-file --marker-size-by-path=foo fileA fileB fileC
=> marker size would be 32
Or:
$ echo "fileC conflict-marker-size=32" > .gitattributes $ git merge-file --marker-size-by-source=theirs fileA fileB fileC
=> marker size would be 32
Documentation/git-merge-file.txt | 5 +++-- builtin-merge-file.c | 1 + t/t6023-merge-file.sh | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 2 deletions(-)
Show changes to 3 files +41 −2
Documentation/git-merge-file.txt, builtin-merge-file.c, t/t6023-merge-file.sh
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt index 234269a..a5b9c1f 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. diff --git a/builtin-merge-file.c b/builtin-merge-file.c index 1e70073..57d757c 100644 --- a/builtin-merge-file.c +++ b/builtin-merge-file.c @@ -39,6 +39,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) XDL_MERGE_FAVOR_OURS), OPT_SET_INT(0, "theirs", &favor, "for conflicts, use their version", XDL_MERGE_FAVOR_THEIRS), + OPT_INTEGER(0, "marker-size", &xmp.marker_size, "for conflicts, use this marker size"), OPT__QUIET(&quiet), OPT_CALLBACK('L', NULL, names, "name", "set labels for file1/orig_file/file2", &label_cb), diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index d605024..5034dd1 100755 --- a/t/t6023-merge-file.sh +++ b/t/t6023-merge-file.sh @@ -215,4 +215,41 @@ test_expect_success '"diff3 -m" style output (2)' ' test_cmp expect actual ' +cat >expect <<\EOF +Dominus regit me, +<<<<<<<<<< new8.txt +et nihil mihi deerit; + + + + +In loco pascuae ibi me collocavit; +super aquam refectionis educavit me. +|||||||||| +et nihil mihi deerit. +In loco pascuae ibi me collocavit, +super aquam refectionis educavit me; +========== +et nihil mihi deerit, + + + + +In loco pascuae ibi me collocavit -- +super aquam refectionis educavit me, +>>>>>>>>>> new9.txt +animam meam convertit, +deduxit me super semitas jusitiae, +propter nomen suum. +Nam et si ambulavero in medio umbrae mortis, +non timebo mala, quoniam TU mecum es: +virga tua et baculus tuus ipsa me consolata sunt. +EOF + +test_expect_success 'marker size' ' + test_must_fail git merge-file -p --marker-size=10 \ + new8.txt new5.txt new9.txt >actual && + test_cmp expect actual +' + test_done
-- 1.7.0.584.g2da2b
