Merge branch 'dp/merge-strategy-doc-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Mar 2018 18:30:13 +0000 (11:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Mar 2018 18:30:13 +0000 (11:30 -0700)
Doc fix.

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

1  2 
Documentation/merge-strategies.txt

Simple merge