Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2010-10-06 | test-lib: make test_expect_code a test command | 1 | -1/+3 | |
2010-07-09 | merge_recursive: Fix renames across paths below D/F conflicts | 1 | -1/+1 | |
2009-07-29 | Add a reminder test case for a merge with F/D transition | 1 | -0/+23 | |
2005-12-03 | New test case: merge with directory/file conflicts | 1 | -0/+25 |