summaryrefslogtreecommitdiff
path: root/t/t6020-merge-df.sh
AgeCommit message (Expand)Author
2020-08-10Collect merge-related tests to t64xxElijah Newren
2020-02-27t6020: new test with interleaved lexicographic ordering of directoriesElijah Newren
2020-02-27t6020, t6022, t6035: update merge tests to use test helper functionsElijah Newren
2018-07-31read-cache: fix directory/file conflict handling in read_index_unmerged()Elijah Newren
2015-04-29merge: deprecate 'git merge <message> HEAD <commit>' syntaxJunio C Hamano
2011-08-14merge-recursive: Fix sorting order and directory change assumptionsElijah Newren
2010-11-30Merge branch 'en/merge-recursive'Junio C Hamano
2010-10-06test-lib: make test_expect_code a test commandÆvar Arnfjörð Bjarmason
2010-09-30merge-recursive: Make room for directories in D/F conflictsElijah Newren
2010-09-30handle_delete_modify(): Check whether D/F conflicts are still presentElijah Newren
2010-09-30t6020: Add a testcase for modify/delete + directory/file conflictElijah Newren
2010-09-30t6020: Modernize style a bitElijah Newren
2010-07-09merge_recursive: Fix renames across paths below D/F conflictsElijah Newren
2009-07-29Add a reminder test case for a merge with F/D transitionAlex Riesen
2005-12-03New test case: merge with directory/file conflictsFredrik Kuivinen