summaryrefslogtreecommitdiff
path: root/t/t6426-merge-skip-unneeded-updates.sh
AgeCommit message (Expand)Author
2020-08-10t6422, t6426: be more flexible for add/add conflicts involving renamesElijah Newren
2020-08-10Collect merge-related tests to t64xxElijah Newren