Re: [PATCH 1/1] Fix typo in merge-strategies documentation

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mar 19, 2018, 14:49 UTC
Message-ID: <nycvar.QRO.7.76.6.1803191548080.55@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
In-Reply-To: <20180317033142.20119-2-david.pursehouse@gmail.com>

Hi David,

On Sat, 17 Mar 2018, David Pursehouse wrote:

Show 10 quoted lines

> 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