t / t5100 / msg0016on commit "reset --merge": fix unmerged case (e11d7b5)
   1and some content
   2