diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-07 08:09:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-07 08:09:42 (GMT) |
| commit | ff32340669a5521ca2b4b547b4853bfe22f60386 (patch) | |
| tree | bca331f6b19b2465ca5c71ab879ce03874f9be58 /merge-recursive.c | |
| parent | 4c6e8aa8f001fa9619dc891c501d0d4389583353 (diff) | |
| parent | 36e3b5eafe967cb721f5e2bbaa396f979b8ebd7c (diff) | |
| download | git-ff32340669a5521ca2b4b547b4853bfe22f60386.zip git-ff32340669a5521ca2b4b547b4853bfe22f60386.tar.gz git-ff32340669a5521ca2b4b547b4853bfe22f60386.tar.bz2 | |
Merge branch 'js/maint-merge-recursive-r-d-conflict'
* 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.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 2da4333..b97026b 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; |