summaryrefslogtreecommitdiff
path: root/t/t6437-submodule-merge.sh
AgeCommit message (Expand)Author
2020-10-26merge tests: expect slight differences in output for recursive vs. ortElijah Newren
2020-08-19Merge branch 'en/merge-tests'Junio C Hamano
2020-08-10Collect merge-related tests to t64xxElijah Newren