diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-03-20 19:38:58 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-20 20:36:11 -0700 |
| commit | f01de62e4591a6acc061eb994d44f7eeef7a0cfd (patch) | |
| tree | 85ede25d7697736056133412abae4739fa79cb36 /merge-recursive.c | |
| parent | 4bb0936206b046a4fe606e9b0c9fe6ecc7a0ff69 (diff) | |
| download | git-f01de62e4591a6acc061eb994d44f7eeef7a0cfd.tar.gz | |
ll_merge(): add ancestor label parameter for diff3-style output
Commands using the ll_merge() function will present conflict hunks
imitating ‘diff3 -m’ output if the merge.conflictstyle configuration
option is set appropriately. Unlike ‘diff3 -m’, the output does not
include a label for the merge base on the ||||||| line of the output,
and some tools misparse the conflict hunks without that.
Add a new ancestor_label parameter to ll_merge() to give callers the
power to rectify this situation. If ancestor_label is NULL, the output
format is unchanged. All callers pass NULL for now.
Requested-by: Stefan Monnier <monnier@iro.umontreal.ca>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 195ebf9744..3b2cc9d15a 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -640,7 +640,7 @@ static int merge_3way(struct merge_options *o, read_mmblob(&src1, a->sha1); read_mmblob(&src2, b->sha1); - merge_status = ll_merge(result_buf, a->path, &orig, + merge_status = ll_merge(result_buf, a->path, &orig, NULL, &src1, name1, &src2, name2, (!!o->call_depth) | (favor << 1)); |