t / t5100 / msg0016on commit merge-octopus: abort if index does not match HEAD (3ec62ad)
   1and some content
   2