summaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
Commit message (Expand)AuthorAgeFilesLines
* Remove empty directories in recursive mergeAlex Riesen2008-09-261-0/+11
* tests: use "git xyzzy" form (t0000 - t3599)Nanako Shiraishi2008-09-031-7/+7
* merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-231-0/+11
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-241-21/+21
* War on whitespaceJunio C Hamano2007-06-071-1/+0
* Remove case-sensitive file in t3030-merge-recursive.Brian Gernhardt2007-04-191-52/+52
* t3030: merge-recursive backend test.Junio C Hamano2007-04-101-0/+528