aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6044-merge-unrelated-index-changes.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2020-08-10Collect merge-related tests to t64xxElijah Newren1-216/+0
2018-07-11merge-recursive: enforce rule that index matches head before mergingElijah Newren1-11/+8
2018-07-11t6044: add more testcases with staged changes before a merge is invokedElijah Newren1-0/+29
2018-07-11merge-recursive: fix assumption that head tree being merged is HEADElijah Newren1-1/+1
2018-07-11merge-recursive: make sure when we say we abort that we actually abortElijah Newren1-1/+1
2018-07-11t6044: add a testcase for index matching head, when head doesn't match HEADElijah Newren1-0/+11
2018-07-03t6044: verify that merges expected to abort actually abortElijah Newren1-11/+21
2017-12-22merge-recursive: avoid incorporating uncommitted changes in a mergeElijah Newren1-1/+1
2017-12-22t6044: recursive can silently incorporate dirty changes in a mergeElijah Newren1-5/+21
2016-05-29Merge branch 'js/t6044-use-test-seq'Junio C Hamano1-2/+2
2016-05-18t6044: replace seq by test_seqJohannes Sixt1-2/+2
2016-04-12t6044: new merge testcases for when index doesn't match HEADElijah Newren1-0/+153
2016-04-12merge-octopus: abort if index does not match HEADElijah Newren1-3/+3
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-16 03:21:32 +0000