summaryrefslogtreecommitdiff
path: root/t/t7405-submodule-merge.sh
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: do not die on a conflicting submoduleJunio C Hamano2009-04-291-3/+3
* update cache for conflicting submodule entriesClemens Buchacher2009-04-051-1/+1
* add tests for merging with submodulesClemens Buchacher2009-04-051-0/+74