t / t5100 / msg0015on commit merge-octopus: abort if index does not match HEAD (3ec62ad)
   1  - a list
   2  - of stuff