aboutsummaryrefslogtreecommitdiff
path: root/t/t6020-merge-df.sh
Commit message (Expand)AuthorAge
* Merge branch 'en/merge-recursive'Junio C Hamano2010-11-29
|\
| * merge-recursive: Make room for directories in D/F conflictsElijah Newren2010-09-29
| * handle_delete_modify(): Check whether D/F conflicts are still presentElijah Newren2010-09-29
| * t6020: Add a testcase for modify/delete + directory/file conflictElijah Newren2010-09-29
| * t6020: Modernize style a bitElijah Newren2010-09-29
* | test-lib: make test_expect_code a test commandÆvar Arnfjörð Bjarmason2010-10-06
|/
* merge_recursive: Fix renames across paths below D/F conflictsElijah Newren2010-07-09
* Add a reminder test case for a merge with F/D transitionAlex Riesen2009-07-29
* New test case: merge with directory/file conflictsFredrik Kuivinen2005-12-03