| commit | 1ac91b32b5f153a91c10fb236a3769541be60ae9 | |
| author | Elijah Newren <newren@gmail.com> | |
| Fri, 12 Aug 2011 05:20:21 +0000 (11 23:20 -0600) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 14 Aug 2011 21:19:39 +0000 (14 14:19 -0700) | ||
| tree | c8816fc69aaa2ca17eaf25d56ac3c004113e4200 | treesnapshot (tar.gz zip) |
| parent | e03acb8bc1f03827210235dd72578b8b26f19c51 | commitdiff |
merge-recursive: add handling for rename/rename/add-dest/add-dest
Each side of the rename in rename/rename(1to2) could potentially also be
involved in a rename/add conflict. Ensure stages for such conflicts are
also recorded.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Each side of the rename in rename/rename(1to2) could potentially also be
involved in a rename/add conflict. Ensure stages for such conflicts are
also recorded.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory | |
| t/t6042-merge-rename-corner-cases.sh | diffblobblamehistory |