summaryrefslogtreecommitdiff
path: root/t/t3509-cherry-pick-merge-df.sh
AgeCommit message (Expand)Author
2011-02-07t3509: use unconstrained initial test to setup repository.Pat Thoyts
2010-09-10merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirElijah Newren
2010-09-10t3509: Add rename + D/F conflict testcase that recursive strategy failsElijah Newren
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