From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Mar 2018 18:30:13 +0000 (-0700)
Subject: Merge branch 'dp/merge-strategy-doc-fix'
X-Git-Tag: v2.17.0-rc1~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e2a37ec2b03456bc9131f7c1fe68e1742bf28953

Merge branch 'dp/merge-strategy-doc-fix'

Doc fix.

* dp/merge-strategy-doc-fix:
Documentation/merge-strategies: typofix
---

e2a37ec2b03456bc9131f7c1fe68e1742bf28953