aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6427-diff3-conflict-markers.sh
AgeCommit message (Expand)AuthorFilesLines
2025-03-18am: switch from merge_recursive_generic() to merge_ort_generic()Elijah Newren1-1/+1
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-06-11parse-options: fix leaks for users of OPT_FILENAMEPatrick Steinhardt1-0/+1
2022-08-26t64xx: convert 'test_create_repo' to 'git init'Elijah Newren1-5/+5
2021-12-01xdiff: implement a zealous diff3, or "zdiff3"Phillip Wood1-0/+90
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-8/+8
2020-11-19t64*: preemptively adjust alignment to prepare for `master` -> `main`Johannes Schindelin1-2/+2
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-08-10Collect merge-related tests to t64xxElijah Newren1-0/+211