From: Junio C Hamano 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: https://git.lorimer.id.au/gitweb.git/diff_plain/77cdf8c6f9d142a8d9693531d442ffa0712874d6 Merge branch 'jc/merge-x-theirs-docfix' into maint The documentation for '-X