merge: save merge state earlier
[git] / t / t5100 / msg0015