From: Jeff King <peff@peff.net>
Date: Mon, 05 May 2008 17:05:12 GMT
Subject: Re: [PATCH] I don't known anyone who understands what it means when they do a merge and see "file.txt: needs update". "file.txt: has changes" is much clearer.
Message-ID: <20080505170512.GD17863@sigill.intra.peff.net>
In-Reply-To: <32541b130805050935l7257a5e3t9b44d61abe28db37@mail.gmail.com>

On Mon, May 05, 2008 at 12:35:06PM -0400, Avery Pennarun wrote:

> Hmm, perhaps the problem then is that we're using plumbing output and
> presenting it to the user as part of the porcelain.  Is there an
> elegant way to fix that?

2>&1 | sed 's/needs update/has local changes/' ?

Oh wait, you said elegant...

-Peff