[PATCH 14/14] merge-recursive: add a label for ancestor
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Mar 21, 2010, 00:52 UTC
- Message-ID
- <20100321005221.GI23888@progeny.tock>
- In-Reply-To
- <20100321002535.GA23681@progeny.tock>
git merge-recursive (and hence git merge) will present conflict hunks in output something like what ‘diff3 -m’ produces if the merge.conflictstyle configuration option is set to diff3. There is a small difference from diff3: diff3 -m includes a label for the merge base on the ||||||| line.
Tools familiar with the format and humans unfamiliar with the format both can benefit from such a label. So mark the start of the text from the merge bases with the heading "||||||| merged common ancestors".
It would be nicer to use a more informative label. Perhaps someone will provide one some day.
git rerere does not have trouble parsing the new output, and its preimage ids are unchanged since it has its own code for re-creating conflict hunks. No other code in git parses conflict hunks.
Requested-by: Stefan Monnier <monnier@iro.umontreal.ca> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- From <http://thread.gmane.org/gmane.comp.version-control.git/142374/focus=142391>.
The new series has a small conflict with ‘next’ (the cherry-pick --no-ff change). I’ll try resolving it and put up the result at
git://repo.or.cz/git/jrn.git merge-diff3-label/for-next
merge-recursive.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c index 017cafd..917397c 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1347,6 +1347,7 @@ int merge_recursive(struct merge_options *o, if (!o->call_depth) read_cache(); + o->ancestor = "merged common ancestors"; clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree, &mrtree);
-- 1.7.0.2