Re: [ANNOUNCE] Git v2.4.0-rc2
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 16, 2015, 05:53 UTC
- Message-ID
- <CAPc5daXYgub5-qG2S7LdTuUAnut4B-qaSeQMNJpoGzORdvZpcA@mail.gmail.com>
- In-Reply-To
- <20150416022216.GA30991@peff.net>
On Wed, Apr 15, 2015 at 7:22 PM, Jeff King <peff@peff.net> wrote:
Show 5 quoted lines
> > In the meantime, unless somebody is planning to jump on this topic > immediately (I am not), I think we can revert 2bf15a3330a from master. > It's definitely fixing _a_ problem, but it's one we've lived with for > many years already.
Yeah, I agree. Nobody should be reading the output to find CONFLICT anyway (isn't "ls-files -u" for these scripts?), but the current error/info levels do look inconsistent.