diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:21 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:39 -0700 |
| commit | 1ac91b32b5f153a91c10fb236a3769541be60ae9 (patch) | |
| tree | c8816fc69aaa2ca17eaf25d56ac3c004113e4200 /t/t4013/diff.format-patch_--inline_--stdout_initial..master | |
| parent | merge-recursive: Have conflict_rename_delete reuse modify/delete code (diff) | |
| download | git-1ac91b32b5f153a91c10fb236a3769541be60ae9.tar.gz git-1ac91b32b5f153a91c10fb236a3769541be60ae9.zip | |
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>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master')
0 files changed, 0 insertions, 0 deletions