Age | Commit message (Expand) | Author |
---|---|---|
2010-11-30 | Merge branch 'en/merge-recursive' | Junio C Hamano |
2010-11-09 | tests: add missing && | Jonathan Nieder |
2010-09-30 | merge-recursive: Avoid doubly merging rename/add conflict contents | Elijah Newren |
2010-09-30 | t6036: Add testcase for undetected conflict | Elijah Newren |
2010-09-30 | t6036: Add a second testcase similar to the first but with content changes | Elijah Newren |
2010-09-30 | t6036: Test index and worktree state, not just that merge fails | Elijah Newren |
2009-07-31 | merge-recursive: don't segfault while handling rename clashes | Junio C Hamano |