merge-strategies: avoid implying that "-s theirs" exists