Age | Commit message (Expand) | Author |
---|---|---|
2007-07-03 | Rewrite "git-frotz" to "git frotz" | Junio C Hamano |
2007-06-05 | merge-recursive: refuse to merge binary files | Johannes Schindelin |
2007-04-17 | Fix permissions on test scripts | Alex Riesen |
2007-03-04 | Get rid of the dependency to GNU diff in the tests | Johannes Schindelin |
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 |