Re: [BUG] 'diff A...B' fails with multiple merge bases
- From
Sverre Rabbelier <srabbelier@gmail.com>
- Date
- Jul 13, 2010, 00:41 UTC
- Message-ID
- <AANLkTinfo1QDguIbNgOt9w9V9xuJbhrCmusfe9g8fosm@mail.gmail.com>
- In-Reply-To
- <7viq4k6xea.fsf@alter.siamese.dyndns.org>
Heya,
On Mon, Jul 12, 2010 at 19:25, Junio C Hamano <gitster@pobox.com> wrote:
Show 5 quoted lines
> + if (ents != i + 2 ||
> + (ent[i+1].item->flags & UNINTERESTING) ||
> + (!ent[i].item->flags & SYMMETRIC_LEFT) ||
> + (ent[i+1].item->flags & SYMMETRIC_LEFT))
> + die("what do you mean by that?");That's about as helpful an error message as "Your parents must hate you" or whatever it is. Can we rephrase it to tell the user what they did wrong, and how to fix it?
-- Cheers, Sverre Rabbelier