summaryrefslogtreecommitdiffstats
path: root/t/t6417-merge-ours-theirs.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* pull: fix a "struct oid_array" memory leakÆvar Arnfjörð Bjarmason2022-07-011-0/+1
* tests: use test_write_lines() to generate line-oriented outputEric Sunshine2021-12-131-4/+1
* pull: abort by default when fast-forwarding is not possibleElijah Newren2021-07-221-5/+5
* t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-201-15/+15
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-201-0/+3
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+108