path: root/t/
AgeCommit message (Expand)Author
2008-03-01t6024: move "git reset" to prepare for a test inside the test itselfJunio C Hamano
2008-02-02Sane use of test_expect_failureJunio C Hamano
2007-07-03Rewrite "git-frotz" to "git frotz"Junio C Hamano
2007-06-05merge-recursive: refuse to merge binary filesJohannes Schindelin
2007-04-16Fix permissions on test scriptsAlex Riesen
2007-03-04Get rid of the dependency to GNU diff in the testsJohannes Schindelin
2006-12-28t6024-recursive-merge: quiet down this testEric Wong
2006-12-23Display 'theirs' branch name when possible in merge.Shawn O. Pearce
2006-12-13merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin
2006-12-13add test case for recursive mergeJunio C Hamano