t / t5100 / emptyon commit merge: save merge state earlier (9d89b35)
   1