t / t5100 / msg0016on commit merge: save merge state earlier (9d89b35)
   1and some content
   2