Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2010-09-09 | merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir | Elijah Newren | 1 | -2/+2 |
2010-09-09 | t3509: Add rename + D/F conflict testcase that recursive strategy fails | Elijah Newren | 1 | -0/+66 |
2010-08-12 | Mark tests that use symlinks as needing SYMLINKS prerequisite | Elijah Newren | 1 | -2/+2 |
2010-07-09 | merge_recursive: Fix renames across paths below D/F conflicts | Elijah Newren | 1 | -1/+1 |
2010-07-09 | Add a rename + D/F conflict testcase | Alexander Gladysh | 1 | -0/+35 |