summaryrefslogtreecommitdiff
path: root/t/t6427-diff3-conflict-markers.sh
Commit message (Expand)AuthorAgeFilesLines
* t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-8/+8
* t64*: preemptively adjust alignment to prepare for `master` -> `main`Johannes Schindelin2020-11-191-2/+2
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* Collect merge-related tests to t64xxElijah Newren2020-08-101-0/+211