Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2007-03-04 | Get rid of the dependency to GNU diff in the tests | 1 | -2/+2 | |
2006-12-28 | t6024-recursive-merge: quiet down this test | 1 | -43/+47 | |
2006-12-23 | Display 'theirs' branch name when possible in merge. | 1 | -3/+3 | |
2006-12-12 | merge-recursive: add/add really is modify/modify with an empty base | 1 | -1/+11 | |
2006-12-12 | add test case for recursive merge | 1 | -0/+70 |