From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 07 Jul 2010 05:28:27 GMT
Subject: Re: [PATCH v2] use "up-to-date" instead of "uptodate" for consistency
Message-ID: <7v8w5n2744.fsf@alter.siamese.dyndns.org>
In-Reply-To: <b49995cd151b36cfff5231b28f5e8ff3970c14a2.1278431239.git.nicolas.s.dev@gmx.fr>

Nicolas Sebrecht <nicolas.s.dev@gmx.fr> writes:

> @@ -22,7 +22,7 @@ static struct unpack_trees_error_msgs unpack_plumbing_errors = {
>  	"Entry '%s' would be overwritten by merge. Cannot merge.",
>  
>  	/* not_uptodate_file */
> -	"Entry '%s' not uptodate. Cannot merge.",
> +	"Entry '%s' not up-to-date. Cannot merge.",
>  
>  	/* not_uptodate_dir */
>  	"Updating '%s' would lose untracked files in it",
> @@ -34,7 +34,7 @@ static struct unpack_trees_error_msgs unpack_plumbing_errors = {
>  	"Entry '%s' overlaps with '%s'.  Cannot bind.",
>  
>  	/* sparse_not_uptodate_file */
> -	"Entry '%s' not uptodate. Cannot update sparse checkout.",
> +	"Entry '%s' not up-to-date. Cannot update sparse checkout.",
>  
>  	/* would_lose_orphaned */
>  	"Working tree file '%s' would be %s by sparse checkout update.",

What word do you see before "errors" on the hunk comment line?