aboutsummaryrefslogtreecommitdiff
path: root/t/t3030-merge-recursive.sh
Commit message (Expand)AuthorAge
* merge-recursive: demonstrate an incorrect conflict with submoduleJohannes Sixt2010-06-11
* Be more user-friendly when refusing to do something because of conflict.Matthieu Moy2010-01-12
* refuse to merge during a mergeClemens Buchacher2009-06-01
* Remove empty directories in recursive mergeAlex Riesen2008-09-26
* tests: use "git xyzzy" form (t0000 - t3599)Nanako Shiraishi2008-09-03
* merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-23
* tests: do not use implicit "git diff --no-index"Junio C Hamano2008-05-24
* War on whitespaceJunio C Hamano2007-06-07
* Remove case-sensitive file in t3030-merge-recursive.Brian Gernhardt2007-04-19
* t3030: merge-recursive backend test.Junio C Hamano2007-04-10