From: Junio C Hamano Date: Tue, 20 Mar 2018 21:22:47 +0000 (-0700) Subject: Merge branch 'dp/merge-strategy-doc-fix' into next X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/317e077588bd945c6bd29d5ead554f6be2a262c0 Merge branch 'dp/merge-strategy-doc-fix' into next Doc fix. * dp/merge-strategy-doc-fix: Documentation/merge-strategies: typofix --- 317e077588bd945c6bd29d5ead554f6be2a262c0