path: root/t/
AgeCommit message (Expand)Author
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