From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Oct 2017 05:19:03 +0000 (+0900)
Subject: Merge branch 'jc/merge-x-theirs-docfix' into maint
X-Git-Tag: v2.15.0-rc2~5^2~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77cdf8c6f9d142a8d9693531d442ffa0712874d6;p=thirdparty%2Fgit.git

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

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

77cdf8c6f9d142a8d9693531d442ffa0712874d6