Commit message (Expand) | Author | Age | |
---|---|---|---|
* | t/: Use "test_must_fail git" instead of "! git" | Stephan Beyer | 2008-07-13 |
* | tests: do not use implicit "git diff --no-index" | Junio C Hamano | 2008-05-24 |
* | t6024: move "git reset" to prepare for a test inside the test itself | Junio C Hamano | 2008-03-01 |
* | Sane use of test_expect_failure | Junio C Hamano | 2008-02-01 |
* | Rewrite "git-frotz" to "git frotz" | Junio C Hamano | 2007-07-02 |
* | merge-recursive: refuse to merge binary files | Johannes Schindelin | 2007-06-04 |
* | 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 |