summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-13 01:15:19 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-13 01:15:19 -0800
commit94468bc1f719b7e0009ec0600b178dd5f412d702 (patch)
treed575fed066ab542840be3ec793fb523491e16677 /merge-recursive.c
parent9e8f6e7f6e8817db30a492e32fa92c1daf51b77c (diff)
parent36e3b5eafe967cb721f5e2bbaa396f979b8ebd7c (diff)
downloadgit-94468bc1f719b7e0009ec0600b178dd5f412d702.tar.gz
Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint
* js/maint-merge-recursive-r-d-conflict: merge-recursive: mark rename/delete conflict as unmerged
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 2da4333439..b97026bd5c 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -934,6 +934,11 @@ static int process_renames(struct merge_options *o,
ren1_src, ren1_dst, branch1,
branch2);
update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
+ update_stages(ren1_dst, NULL,
+ branch1 == o->branch1 ?
+ ren1->pair->two : NULL,
+ branch1 == o->branch1 ?
+ NULL : ren1->pair->two, 1);
} else if (!sha_eq(dst_other.sha1, null_sha1)) {
const char *new_path;
clean_merge = 0;