summaryrefslogtreecommitdiff
path: root/t/t6020-merge-df.sh
AgeCommit message (Expand)AuthorFilesLines
2011-08-14merge-recursive: Fix sorting order and directory change assumptionsLibravatar Elijah Newren1-8/+18
2010-11-29Merge branch 'en/merge-recursive'Libravatar Junio C Hamano1-13/+63
2010-10-06test-lib: make test_expect_code a test commandLibravatar Ævar Arnfjörð Bjarmason1-1/+3
2010-09-29merge-recursive: Make room for directories in D/F conflictsLibravatar Elijah Newren1-1/+1
2010-09-29handle_delete_modify(): Check whether D/F conflicts are still presentLibravatar Elijah Newren1-1/+1
2010-09-29t6020: Add a testcase for modify/delete + directory/file conflictLibravatar Elijah Newren1-0/+47
2010-09-29t6020: Modernize style a bitLibravatar Elijah Newren1-15/+20
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