summaryrefslogtreecommitdiff
path: root/t/t3509-cherry-pick-merge-df.sh
AgeCommit message (Expand)Author
2010-08-13Mark tests that use symlinks as needing SYMLINKS prerequisiteElijah Newren
2010-07-09merge_recursive: Fix renames across paths below D/F conflictsElijah Newren
2010-07-09Add a rename + D/F conflict testcaseAlexander Gladysh