Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Fix permissions on test scripts | Alex Riesen | 2007-04-16 |
* | Get rid of the dependency to GNU diff in the tests | Johannes Schindelin | 2007-03-04 |
* | 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 |