summaryrefslogtreecommitdiff
path: root/t/t6044-merge-unrelated-index-changes.sh
AgeCommit message (Expand)Author
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