t / t5100 / msg0006on commit merge-strategies: avoid implying that "-s theirs" exists (c25d98b)
   1Here is a patch from A U Thor.
   2