| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge-recursive: Fix sorting order and directory change assumptions | Elijah Newren | 2011-08-14 | 1 | -8/+18 |
| * | Merge branch 'en/merge-recursive' | Junio C Hamano | 2010-11-29 | 1 | -13/+63 |
| |\ | |||||
| | * | merge-recursive: Make room for directories in D/F conflicts | Elijah Newren | 2010-09-29 | 1 | -1/+1 |
| | * | handle_delete_modify(): Check whether D/F conflicts are still present | Elijah Newren | 2010-09-29 | 1 | -1/+1 |
| | * | t6020: Add a testcase for modify/delete + directory/file conflict | Elijah Newren | 2010-09-29 | 1 | -0/+47 |
| | * | t6020: Modernize style a bit | Elijah Newren | 2010-09-29 | 1 | -15/+20 |
| * | | test-lib: make test_expect_code a test command | Ævar Arnfjörð Bjarmason | 2010-10-06 | 1 | -1/+3 |
| |/ | |||||
| * | merge_recursive: Fix renames across paths below D/F conflicts | Elijah Newren | 2010-07-09 | 1 | -1/+1 |
| * | Add a reminder test case for a merge with F/D transition | Alex Riesen | 2009-07-29 | 1 | -0/+23 |
| * | New test case: merge with directory/file conflicts | Fredrik Kuivinen | 2005-12-03 | 1 | -0/+25 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |