summaryrefslogtreecommitdiff
path: root/t/t6417-merge-ours-theirs.sh
AgeCommit message (Expand)AuthorFilesLines
2021-12-13tests: use test_write_lines() to generate line-oriented outputLibravatar Eric Sunshine1-4/+1
2021-07-22pull: abort by default when fast-forwarding is not possibleLibravatar Elijah Newren1-5/+5
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-15/+15
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/+108