| Age | Commit message (Expand) | Author | Files | Lines |
|---|
| 2020-08-10 | Collect merge-related tests to t64xx | Elijah Newren | 1 | -150/+0 |
| 2020-02-27 | t6020: new test with interleaved lexicographic ordering of directories | Elijah Newren | 1 | -0/+43 |
| 2020-02-27 | t6020, t6022, t6035: update merge tests to use test helper functions | Elijah Newren | 1 | -6/+6 |
| 2018-07-31 | read-cache: fix directory/file conflict handling in read_index_unmerged() | Elijah Newren | 1 | -3/+0 |
| 2015-04-29 | merge: deprecate 'git merge <message> HEAD <commit>' syntax | Junio C Hamano | 1 | -1/+1 |
| 2011-08-14 | merge-recursive: Fix sorting order and directory change assumptions | Elijah Newren | 1 | -8/+18 |
| 2010-11-29 | Merge branch 'en/merge-recursive' | Junio C Hamano | 1 | -13/+63 |
| 2010-10-06 | test-lib: make test_expect_code a test command | Ævar Arnfjörð Bjarmason | 1 | -1/+3 |
| 2010-09-29 | merge-recursive: Make room for directories in D/F conflicts | Elijah Newren | 1 | -1/+1 |
| 2010-09-29 | handle_delete_modify(): Check whether D/F conflicts are still present | Elijah Newren | 1 | -1/+1 |
| 2010-09-29 | t6020: Add a testcase for modify/delete + directory/file conflict | Elijah Newren | 1 | -0/+47 |
| 2010-09-29 | t6020: Modernize style a bit | Elijah Newren | 1 | -15/+20 |
| 2010-07-09 | merge_recursive: Fix renames across paths below D/F conflicts | Elijah Newren | 1 | -1/+1 |
| 2009-07-29 | Add a reminder test case for a merge with F/D transition | Alex Riesen | 1 | -0/+23 |
| 2005-12-03 | New test case: merge with directory/file conflicts | Fredrik Kuivinen | 1 | -0/+25 |
