12 Commits (b8ebe08b9a643f432866eb7150c3b20d59b755f2)

Author SHA1 Message Date
Stephan Beyer d492b31caf t/: Use "test_must_fail git" instead of "! git" 17 years ago
Junio C Hamano 3af828634f tests: do not use implicit "git diff --no-index" 17 years ago
Junio C Hamano c3b088d9da t6024: move "git reset" to prepare for a test inside the test itself 17 years ago
Junio C Hamano 41ac414ea2 Sane use of test_expect_failure 17 years ago
Junio C Hamano 5be60078c9 Rewrite "git-frotz" to "git frotz" 18 years ago
Johannes Schindelin fadf488f9b merge-recursive: refuse to merge binary files 18 years ago
Johannes Schindelin 9f30855d0f merge-recursive: refuse to merge binary files 18 years ago
Alex Riesen 4848509a97 Fix permissions on test scripts 18 years ago
Johannes Schindelin 5bd74506cd Get rid of the dependency to GNU diff in the tests 18 years ago
Eric Wong 7d2ba1229c t6024-recursive-merge: quiet down this test 18 years ago
Shawn O. Pearce e0ec18192d Display 'theirs' branch name when possible in merge. 18 years ago
Johannes Schindelin f953831e03 merge-recursive: add/add really is modify/modify with an empty base 18 years ago
Junio C Hamano c93be3b539 add test case for recursive merge 18 years ago