[PATCH 02/10] merge-file --diff3: add a label for ancestor
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Mar 15, 2010, 07:51 UTC
- Message-ID
- <20100315075121.GB8824@progeny.tock>
- In-Reply-To
- <20100315074748.GA28827@progeny.tock>
git merge-file --diff3 can be used to present conflicts hunks including text from the common ancestor.
The added information can be very helpful for resolving a merge by hand, and merge tools can usually grok it because it looks like output from diff3 -m. Unfortunately, some cannot reportedly, because ‘diff3’ includes a label for the merge base on the ||||||| line and some tools cannot parse conflict hunks without such a label. So write the base-name as passed in a -L option (or the name of the “ancestor” file by default) on that line.
git rerere will not have trouble parsing this output, since instead of looking for a newline, it looks for whitespace after the ||||||| marker. No other code in git tries to parse conflict hunks.
Reported-by: Stefan Monnier <monnier@iro.umontreal.ca> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- This requires a slight change when merging with next. A test was added to t6023-merge-file.sh for the longer conflict markers; the corresponding line in that new test needs to have new5.txt added as well.
builtin/merge-file.c | 1 + t/t6023-merge-file.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 1e70073..0ff8b03 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -72,6 +72,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) argv[i]); } + xmp.ancestor = names[1]; ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2], &xmp, XDL_MERGE_FLAGS(level, style, favor), &result); diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh index d605024..16c3c69 100755 --- a/t/t6023-merge-file.sh +++ b/t/t6023-merge-file.sh @@ -181,7 +181,7 @@ et nihil mihi deerit; In loco pascuae ibi me collocavit; super aquam refectionis educavit me. -||||||| +||||||| new5.txt et nihil mihi deerit. In loco pascuae ibi me collocavit, super aquam refectionis educavit me;
-- 1.7.0