t / t5100 / msg0006on commit Merge branch 'jc/conflict-marker-size' (06dbc1e)
   1Here is a patch from A U Thor.
   2