aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7405-submodule-merge.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2020-08-10Collect merge-related tests to t64xxElijah Newren1-455/+0
2019-05-14tests: add a special setup where prerequisites failÆvar Arnfjörð Bjarmason1-1/+1
2018-07-11t7405: verify 'merge --abort' works after submodule/path conflictsElijah Newren1-0/+31
2018-07-11t7405: add a directory/submodule conflictElijah Newren1-0/+88
2018-07-11t7405: add a file/submodule conflictElijah Newren1-0/+54
2017-10-07tests: fix diff order arguments in test_cmpStefan Beller1-1/+1
2011-10-13submodule: Search for merges only at end of recursive mergeBrad King1-1/+1
2011-10-13submodule: Demonstrate known breakage during recursive mergeBrad King1-0/+51
2011-03-30submodule: process conflicting submodules only onceNicolas Morey-Chaisemartin1-6/+52
2010-09-03t7405: cd inside subshell instead of aroundJens Lehmann1-11/+6
2010-07-07Implement automatic fast-forward merge for submodulesHeiko Voigt1-6/+122
2010-07-06add missing && to submodule-merge testcaseHeiko Voigt1-1/+1
2009-04-29merge-recursive: do not die on a conflicting submoduleJunio C Hamano1-3/+3
2009-04-05update cache for conflicting submodule entriesClemens Buchacher1-1/+1
2009-04-05add tests for merging with submodulesClemens Buchacher1-0/+74
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-29 02:47:05 +0000