summaryrefslogtreecommitdiff
path: root/t/t6044-merge-unrelated-index-changes.sh
AgeCommit message (Expand)AuthorFilesLines
2018-07-11merge-recursive: enforce rule that index matches head before mergingLibravatar Elijah Newren1-11/+8
2018-07-11t6044: add more testcases with staged changes before a merge is invokedLibravatar Elijah Newren1-0/+29
2018-07-11merge-recursive: fix assumption that head tree being merged is HEADLibravatar Elijah Newren1-1/+1
2018-07-11merge-recursive: make sure when we say we abort that we actually abortLibravatar Elijah Newren1-1/+1
2018-07-11t6044: add a testcase for index matching head, when head doesn't match HEADLibravatar Elijah Newren1-0/+11
2018-07-03t6044: verify that merges expected to abort actually abortLibravatar Elijah Newren1-11/+21
2017-12-22merge-recursive: avoid incorporating uncommitted changes in a mergeLibravatar Elijah Newren1-1/+1
2017-12-22t6044: recursive can silently incorporate dirty changes in a mergeLibravatar Elijah Newren1-5/+21
2016-05-29Merge branch 'js/t6044-use-test-seq'Libravatar Junio C Hamano1-2/+2
2016-05-18t6044: replace seq by test_seqLibravatar Johannes Sixt1-2/+2
2016-04-12t6044: new merge testcases for when index doesn't match HEADLibravatar Elijah Newren1-0/+153
2016-04-12merge-octopus: abort if index does not match HEADLibravatar Elijah Newren1-3/+3