summaryrefslogtreecommitdiff
path: root/t/t6431-merge-criscross.sh