t / t5100 / msg0016on commit checkout: prevent losing staged changes with --merge (6eff409)
   1and some content
   2