summaryrefslogtreecommitdiffstats
path: root/t/t6436-merge-overwrite.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t6423, t6436: note improved ort handling with dirty filesElijah Newren2020-10-261-5/+13
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+195