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