From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 03 May 2008 16:57:49 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: <7v3aozwcj6.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <alpine.DEB.1.00.0805031509170.30431@racer>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> On Sat, 3 May 2008, Tim Harper wrote:
>
>> -			printf("%s: needs update\n", ce->name);
>> +			printf("%s: has changes\n", ce->name);
>
> How about "local changes"?

Aren't there Porcelain and end-user scripts that relies on the output by
doing "sed -ne s'/: needs update$//p"?