summaryrefslogtreecommitdiff
path: root/t/t6020-merge-df.sh
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: Fix sorting order and directory change assumptionsElijah Newren2011-08-141-8/+18
* Merge branch 'en/merge-recursive'Junio C Hamano2010-11-291-13/+63
|\
| * merge-recursive: Make room for directories in D/F conflictsElijah Newren2010-09-291-1/+1
| * handle_delete_modify(): Check whether D/F conflicts are still presentElijah Newren2010-09-291-1/+1
| * t6020: Add a testcase for modify/delete + directory/file conflictElijah Newren2010-09-291-0/+47
| * t6020: Modernize style a bitElijah Newren2010-09-291-15/+20
* | test-lib: make test_expect_code a test commandÆvar Arnfjörð Bjarmason2010-10-061-1/+3
|/
* merge_recursive: Fix renames across paths below D/F conflictsElijah Newren2010-07-091-1/+1
* Add a reminder test case for a merge with F/D transitionAlex Riesen2009-07-291-0/+23
* New test case: merge with directory/file conflictsFredrik Kuivinen2005-12-031-0/+25