Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2010-09-29 | t6036: Add a second testcase similar to the first but with content changes | Elijah Newren | 1 | -0/+76 |
2010-09-29 | t6036: Test index and worktree state, not just that merge fails | Elijah Newren | 1 | -3/+21 |
2009-07-30 | merge-recursive: don't segfault while handling rename clashes | Junio C Hamano | 1 | -0/+55 |