From: Tim Harper Date: Sat, 03 May 2008 20:10:48 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: <3DE78C03-DA35-4CB5-8D3D-0529A89065EC@gmail.com> In-Reply-To: <7v3aozwcj6.fsf@gitster.siamese.dyndns.org> I ran all of the tests with the patch apply, and they all pass. Is that enough indication? Tim On May 3, 2008, at 10:57 AM, Junio C Hamano wrote: > Johannes Schindelin 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"? >