diff options
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)); |