From: Michael Nahas <mike.nahas@gmail.com>
Date: Mon, 13 Jun 2011 02:14:34 GMT
Subject: Re: Command-line interface thoughts
Message-ID: <BANLkTikNwk0HpJ-G+fc7NwRdY_=Hy930iQ@mail.gmail.com>
In-Reply-To: <7v8vt6spr0.fsf@alter.siamese.dyndns.org>

On Sun, Jun 12, 2011 at 5:29 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Michael Nahas <mike.nahas@gmail.com> writes:
>
>> It is clear that implementing NEXT/WTREE will worsen the performance
>> of some commands ("git diff" under merge conflict).
>
> It is not clear to me at all. I generally do not to base my first
> objection on performance. When I have problems with proposals at the
> design and concept level, I do not have a chance to even bother about
> performance aspect, before questioning the proposal.

My apologies.  "Performance" was an ambiguous word.

I meant that "git diff" under a merge conflict would be less
informative if forced it to be equivalent to some notation with
NEXT/WTREE.  Even if we allowed diff3 and defined BASE, OURS, THEIRS.