summaryrefslogtreecommitdiff
path: root/t/t6426-merge-skip-unneeded-updates.sh
AgeCommit message (Expand)AuthorFilesLines
2020-10-26t/: new helper for tests that pass with ort but fail with recursiveLibravatar Elijah Newren1-1/+2
2020-08-10t6422, t6426: be more flexible for add/add conflicts involving renamesLibravatar Elijah Newren1-1/+1
2020-08-10Collect merge-related tests to t64xxLibravatar Elijah Newren1-0/+770