summaryrefslogtreecommitdiff
path: root/t/t6418-merge-text-auto.sh
Commit message (Expand)AuthorAgeFilesLines
* merge-ort: fix bug with renormalization and rename/delete conflictsElijah Newren2021-12-301-0/+26
* t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-7/+7
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* t6418: tighten delete/normalize conflict testcaseElijah Newren2020-08-101-1/+2
* Collect merge-related tests to t64xxElijah Newren2020-08-101-0/+203