t / t5100 / msg0001on commit conflict-marker-size: new attribute (23a64c9)
   1Here is a patch from A U Thor.
   2