t / t5100 / msg0017on commit checkout: prevent losing staged changes with --merge (6eff409)
   1New content here
   2