summaryrefslogtreecommitdiff
path: root/t/t3509-cherry-pick-merge-df.sh
Commit message (Expand)AuthorAgeFilesLines
* 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