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