aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6424-merge-unrelated-index-changes.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-04-08tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithmElijah Newren1-3/+1
2025-04-08builtin/merge-recursive: switch to using merge_ort_generic()Elijah Newren1-1/+3
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-11-04builtin/merge: release output buffer after performing mergePatrick Steinhardt1-0/+1
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-3/+3
2022-07-22merge: make restore_state() restore staged state tooElijah Newren1-1/+6
2022-07-22merge: fix save_state() to work when there are stat-dirty filesElijah Newren1-0/+11
2022-07-22merge: do not abort early if one strategy fails to handle the mergeElijah Newren1-0/+16
2022-07-22merge: abort if index does not match HEAD for trivial mergesElijah Newren1-1/+21
2022-07-22merge-resolve: abort if index does not match HEADElijah Newren1-0/+13
2022-05-19t6424: make sure a failed merge preserves local changesJunio C Hamano1-2/+30
2021-09-12tests: remove leftover untracked filesElijah Newren1-0/+1
2020-08-10Collect merge-related tests to t64xxElijah Newren1-0/+216
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-13 20:25:08 +0000