Merge branch 'jc/merge-x-theirs-docfix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Sep 2017 05:47:57 +0000 (14:47 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Sep 2017 05:47:57 +0000 (14:47 +0900)
The documentation for '-X<option>' for merges was misleadingly
written to suggest that "-s theirs" exists, which is not the case.

* jc/merge-x-theirs-docfix:
  merge-strategies: avoid implying that "-s theirs" exists


Trivial merge