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?hp=ed4b26e581f5ebdcc5b1461f6e7ae613a5a74408 Merge branch 'dp/merge-strategy-doc-fix' into next Doc fix. * dp/merge-strategy-doc-fix: Documentation/merge-strategies: typofix --- diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index fd5d748d1b..4a58aad4b8 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -40,7 +40,7 @@ the other tree did, declaring 'our' history contains all that happened in it. theirs;; This is the opposite of 'ours'; note that, unlike 'ours', there is - no 'theirs' merge stragegy to confuse this merge option with. + no 'theirs' merge strategy to confuse this merge option with. patience;; With this option, 'merge-recursive' spends a little extra time