summaryrefslogtreecommitdiff
path: root/t/t7405-submodule-merge.sh
AgeCommit message (Expand)Author
2010-09-03t7405: cd inside subshell instead of aroundJens Lehmann
2010-07-07Implement automatic fast-forward merge for submodulesHeiko Voigt
2010-07-07add missing && to submodule-merge testcaseHeiko Voigt
2009-04-29merge-recursive: do not die on a conflicting submoduleJunio C Hamano
2009-04-05update cache for conflicting submodule entriesClemens Buchacher
2009-04-05add tests for merging with submodulesClemens Buchacher