From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Tue, 08 Sep 2009 07:20:07 GMT
Subject: Re: Improving merge failure message
Message-ID: <fabb9a1e0909080020i3daa92aar952fc5102df62bdb@mail.gmail.com>
In-Reply-To: <7veiqhgb4y.fsf@alter.siamese.dyndns.org>

Heya,

On Tue, Sep 8, 2009 at 09:15, Junio C Hamano<gitster@pobox.com> wrote:
> +               /* would_overwrite */
> +               "Your local changes to '%s' will be clobbered by merge.  Aborting.",

Still scary, shouldn't that be s/will be/would be/ ?

> +               /* not_uptodate_file */
> +               "Your local changes to '%s' will be clobbered by merge.  Aborting.",

Ditto.

> +               /* not_uptodate_dir */
> +               "Updating '%s' would lose untracked files in it.  Aborting.",

Not sure, but maybe s/in it//

-- 
Cheers,

Sverre Rabbelier