On Sun, Jun 12, 2011 at 5:29 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Michael Nahas <mike.nahas@xxxxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html