| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | t6024-recursive-merge: quiet down this test | Eric Wong | 2006-12-28 | 1 | -43/+47 |
| * | Display 'theirs' branch name when possible in merge. | Shawn O. Pearce | 2006-12-23 | 1 | -3/+3 |
| * | merge-recursive: add/add really is modify/modify with an empty base | Johannes Schindelin | 2006-12-13 | 1 | -1/+11 |
| * | add test case for recursive merge | Junio C Hamano | 2006-12-13 | 1 | -0/+70 |
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |