summaryrefslogtreecommitdiff
path: root/t/t6020-merge-df.sh
AgeCommit message (Expand)AuthorFilesLines
2010-10-06test-lib: make test_expect_code a test commandLibravatar Ævar Arnfjörð Bjarmason1-1/+3
2010-07-09merge_recursive: Fix renames across paths below D/F conflictsLibravatar Elijah Newren1-1/+1
2009-07-29Add a reminder test case for a merge with F/D transitionLibravatar Alex Riesen1-0/+23
2005-12-03New test case: merge with directory/file conflictsLibravatar Fredrik Kuivinen1-0/+25