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