summaryrefslogtreecommitdiff
path: root/t/t6427-diff3-conflict-markers.sh
AgeCommit message (Expand)AuthorFilesLines
2021-12-01xdiff: implement a zealous diff3, or "zdiff3"Libravatar Phillip Wood1-0/+90
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-8/+8
2020-11-19t64*: preemptively adjust alignment to prepare for `master` -> `main`Libravatar Johannes Schindelin1-2/+2
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-08-10Collect merge-related tests to t64xxLibravatar Elijah Newren1-0/+211