aboutsummaryrefslogtreecommitdiff
path: root/t/t7405-submodule-merge.sh
Commit message (Expand)AuthorAge
* update cache for conflicting submodule entriesClemens Buchacher2009-04-05
* add tests for merging with submodulesClemens Buchacher2009-04-05