t / t5100 / msg0016on commit blame: allow "blame file" in the middle of a conflicted merge (9aeaab6)
   1and some content
   2