t / t5100 / msg0017on commit merge-strategies: avoid implying that "-s theirs" exists (c25d98b)
   1New content here
   2