Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |