t / t5100 / msg0016on commit checkout -m --conflict=diff3: add a label for ancestor (c415162)
   1and some content
   2