summaryrefslogtreecommitdiffstats
path: root/t/t6409-merge-subtree.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt2024-11-211-1/+0
* match-trees: fix leaking prefixes in `shift_tree()`Patrick Steinhardt2024-09-051-0/+1
* tests: use test_write_lines() to generate line-oriented outputEric Sunshine2021-12-131-3/+3
* pull: abort by default when fast-forwarding is not possibleElijah Newren2021-07-221-3/+3
* t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-201-9/+9
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-201-0/+3
* tests: avoid using the branch name `main`Johannes Schindelin2020-10-081-6/+6
* tests: avoid variations of the `master` branch nameJohannes Schindelin2020-09-271-7/+7
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+152