t / t5100 / msg0015on commit merge-strategies: avoid implying that "-s theirs" exists (c25d98b)
   1  - a list
   2  - of stuff