summaryrefslogtreecommitdiffstats
path: root/t/t6427-diff3-conflict-markers.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt2024-11-211-1/+0
* parse-options: fix leaks for users of OPT_FILENAMEPatrick Steinhardt2024-06-111-0/+1
* t64xx: convert 'test_create_repo' to 'git init'Elijah Newren2022-08-261-5/+5
* xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood2021-12-011-0/+90
* t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-201-8/+8
* t64*: preemptively adjust alignment to prepare for `master` -> `main`Johannes Schindelin2020-11-201-2/+2
* 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/+211