summaryrefslogtreecommitdiff
path: root/t/t3509-cherry-pick-merge-df.sh
AgeCommit message (Expand)AuthorFilesLines
2010-09-09merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dirLibravatar Elijah Newren1-2/+2
2010-09-09t3509: Add rename + D/F conflict testcase that recursive strategy failsLibravatar Elijah Newren1-0/+66
2010-08-12Mark tests that use symlinks as needing SYMLINKS prerequisiteLibravatar Elijah Newren1-2/+2
2010-07-09merge_recursive: Fix renames across paths below D/F conflictsLibravatar Elijah Newren1-1/+1
2010-07-09Add a rename + D/F conflict testcaseLibravatar Alexander Gladysh1-0/+35