summaryrefslogtreecommitdiff
path: root/t/t6417-merge-ours-theirs.sh
AgeCommit message (Expand)Author
2022-07-01pull: fix a "struct oid_array" memory leakÆvar Arnfjörð Bjarmason
2021-12-13tests: use test_write_lines() to generate line-oriented outputEric Sunshine
2021-07-22pull: abort by default when fast-forwarding is not possibleElijah Newren
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-08-10Collect merge-related tests to t64xxElijah Newren