diff options
| author | Elijah Newren <newren@gmail.com> | 2011-08-11 23:20:05 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-14 14:19:37 -0700 |
| commit | 7769a75e96f998b2f1ef51e8a2e88058f56fa519 (patch) | |
| tree | 19146cd6e2423c0ceca3da760aabb1707eb8bb1e /t/t4013/diff.format-patch_--inline_--stdout_initial..master | |
| parent | merge-recursive: Make dead code for rename/rename(2to1) conflicts undead (diff) | |
| download | git-7769a75e96f998b2f1ef51e8a2e88058f56fa519.tar.gz git-7769a75e96f998b2f1ef51e8a2e88058f56fa519.zip | |
merge-recursive: Add comments about handling rename/add-source cases
There are a couple of places where changes are needed to for situations
involving rename/add-source issues. Add comments about the needed changes
(and existing bugs) until git has been enabled to detect such cases.
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