t / t5100 / msg0008on commit merge-strategies: avoid implying that "-s theirs" exists (c25d98b)
   1>Here is an empty patch from A U Thor.
   2
   3Hey you forgot the patch!
   4