summaryrefslogtreecommitdiffstats
path: root/t/t6044-merge-unrelated-index-changes.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/t6044-use-test-seq'Junio C Hamano2016-05-301-2/+2
|\
| * t6044: replace seq by test_seqJohannes Sixt2016-05-181-2/+2
* | merge-octopus: abort if index does not match HEADElijah Newren2016-04-131-3/+3
|/
* t6044: new merge testcases for when index doesn't match HEADElijah Newren2016-04-131-0/+153