summaryrefslogtreecommitdiffstats
path: root/t/t6418-merge-text-auto.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t6418: tighten delete/normalize conflict testcaseElijah Newren2020-08-111-1/+2
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+203