summary refs log tree commit diff
path: root/t/t6437-submodule-merge.sh
AgeCommit message (Expand)AuthorFilesLines
2021-10-08merge-{ort,recursive}: remove add_submodule_odb()Jonathan Tan1-0/+3
2021-03-20t: mark several submodule merging tests as fixed under merge-ortElijah Newren1-2/+3
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-8/+8
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-10-26merge tests: expect slight differences in output for recursive vs. ortElijah Newren1-4/+21
2020-08-19Merge branch 'en/merge-tests'Junio C Hamano1-0/+455
2020-08-10Collect merge-related tests to t64xxElijah Newren1-0/+455