summaryrefslogtreecommitdiff
path: root/t/t6418-merge-text-auto.sh
AgeCommit message (Expand)Author
2020-08-10t6418: tighten delete/normalize conflict testcaseElijah Newren
2020-08-10Collect merge-related tests to t64xxElijah Newren