| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2010-08-13 | Mark tests that use symlinks as needing SYMLINKS prerequisite | Elijah Newren | |
| Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | |||
| 2010-07-09 | merge_recursive: Fix renames across paths below D/F conflicts | Elijah Newren | |
| The rename logic in process_renames() handles renames and merging of file contents and then marks files as processed. However, there may be higher stage entries left in the index for other reasons (e.g., due to D/F conflicts). By checking for such cases and marking the entry as not processed, it allows process_entry() later to look at it and handle those higher stages. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | |||
| 2010-07-09 | Add a rename + D/F conflict testcase | Alexander Gladysh | |
| This is a simple testcase where both sides of the rename are paths involved in (separate) D/F merge conflicts Signed-off-by: Alexander Gladysh <agladysh@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | |||
 |
index : git | |
| Git: sistema de control de versiones | mirror |
| summaryrefslogtreecommitdiff |