t / t5100 / msg0018on commit merge: save merge state earlier (9d89b35)
   1a commit message
   2