| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | t6024-recursive-merge: quiet down this test | Eric Wong | 2006-12-28 |
| * | Display 'theirs' branch name when possible in merge. | Shawn O. Pearce | 2006-12-23 |
| * | merge-recursive: add/add really is modify/modify with an empty base | Johannes Schindelin | 2006-12-12 |
| * | add test case for recursive merge | Junio C Hamano | 2006-12-12 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |