t / t5100 / msg0016on commit git merge -X<option> (8cc5b29)
   1and some content
   2