t / t5100 / msg0001on commit t6019: test file dropped in -s ours merge (c72424b)
   1Here is a patch from A U Thor.
   2