aboutsummaryrefslogtreecommitdiff
path: root/t/t6036-recursive-corner-cases.sh
Commit message (Expand)AuthorAge
* merge-recursive: don't segfault while handling rename clashesJunio C Hamano2009-07-30