From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Sep 2017 05:47:57 +0000 (+0900)
Subject: Merge branch 'jc/merge-x-theirs-docfix'
X-Git-Tag: v2.15.0-rc0~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4da3e234f5a3989328c4dc8368cf5906f8679b30;p=thirdparty%2Fgit.git

Merge branch 'jc/merge-x-theirs-docfix'

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
---

4da3e234f5a3989328c4dc8368cf5906f8679b30