From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Mar 2013 16:11:04 GMT
Subject: Re: [PATCH] Fixed typo in git-pull manual
Message-ID: <7vmwtoomav.fsf@alter.siamese.dyndns.org>
In-Reply-To: <d50c433f40ef6d353966b84250c40d9ecd9de51d.1364381294.git.mihai@mihaic.ro>

Mihai Capotă <mihai@mihaic.ro> writes:

> Signed-off-by: Mihai Capotă <mihai@mihaic.ro>
> ---

Thanks.

It might be better to make it "which resulted in complex conflicts",
though.

>  Documentation/git-pull.txt |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
> index c975743..eec4c1d 100644
> --- a/Documentation/git-pull.txt
> +++ b/Documentation/git-pull.txt
> @@ -218,7 +218,7 @@ $ git merge origin/next
>  ------------------------------------------------
>  
>  
> -If you tried a pull which resulted in a complex conflicts and
> +If you tried a pull which resulted in a complex conflict and
>  would want to start over, you can recover with 'git reset'.