t / t5100 / msg0007on commit Merge branch 'jc/conflict-marker-size' (3f3f8d9)
   1Here is an empty patch from A U Thor.
   2