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