path: root/t/
AgeCommit message (Expand)Author
2018-07-11merge-recursive: enforce rule that index matches head before mergingElijah Newren
2018-07-11t6044: add more testcases with staged changes before a merge is invokedElijah Newren
2018-07-11merge-recursive: fix assumption that head tree being merged is HEADElijah Newren
2018-07-11merge-recursive: make sure when we say we abort that we actually abortElijah Newren
2018-07-11t6044: add a testcase for index matching head, when head doesn't match HEADElijah Newren
2018-07-03t6044: verify that merges expected to abort actually abortElijah Newren
2017-12-22merge-recursive: avoid incorporating uncommitted changes in a mergeElijah Newren
2017-12-22t6044: recursive can silently incorporate dirty changes in a mergeElijah Newren
2016-05-30Merge branch 'js/t6044-use-test-seq'Junio C Hamano
2016-05-18t6044: replace seq by test_seqJohannes Sixt
2016-04-13t6044: new merge testcases for when index doesn't match HEADElijah Newren
2016-04-13merge-octopus: abort if index does not match HEADElijah Newren