Hi David, On Sat, 17 Mar 2018, David Pursehouse wrote:
> diff --git a/Documentation/merge-strategies.txt > b/Documentation/merge-strategies.txt > index fd5d748d1..4a58aad4b 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. Well spotted: it is `strategy`, not `stragegy` (nor `stragedy`, I might want to add :-)) I just verified that there is no other hit in `git grep stragegy`'s output. Thanks, Johannes
