summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
AgeCommit message (Expand)Author
2008-09-26Remove empty directories in recursive mergeAlex Riesen
2008-09-03tests: use "git xyzzy" form (t0000 - t3599)Nanako Shiraishi
2008-08-24merge: fix numerus bugs around "trivial merge" areaJunio C Hamano
2008-05-24tests: do not use implicit "git diff --no-index"Junio C Hamano
2007-06-07War on whitespaceJunio C Hamano
2007-04-20Remove case-sensitive file in t3030-merge-recursive.Brian Gernhardt
2007-04-10t3030: merge-recursive backend test.Junio C Hamano