summaryrefslogtreecommitdiff
path: root/t/t3509-cherry-pick-merge-df.sh
Commit message (Expand)AuthorAgeFilesLines
* t3509: use unconstrained initial test to setup repository.Pat Thoyts2011-02-071-2/+4
* merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirElijah Newren2010-09-091-2/+2
* t3509: Add rename + D/F conflict testcase that recursive strategy failsElijah Newren2010-09-091-0/+66
* Mark tests that use symlinks as needing SYMLINKS prerequisiteElijah Newren2010-08-121-2/+2
* merge_recursive: Fix renames across paths below D/F conflictsElijah Newren2010-07-091-1/+1
* Add a rename + D/F conflict testcaseAlexander Gladysh2010-07-091-0/+35