From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 01 Apr 2009 17:56:32 GMT
Subject: Re: [PATCH 1/8] mergetool: use tabs consistently
Message-ID: <7vab70z29b.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20090331063613.GA20690@gmail.com>

David Aguilar <davvid@gmail.com> writes:

> On  0, Charles Bailey <charles@hashpling.org> wrote:
>> On Mon, Mar 30, 2009 at 01:44:01AM -0700, Junio C Hamano wrote:
>> 
>> I don't much like [1/8] though. I'm all in favour of consistency, but
>> this patch touches most of the lines in git-mergetool and tries to go
>> the opposite way to the consistency drive that we were trying to
>> introduce gradually (i.e. only through lines materially affected by
>> subsequent patches) in:
>
> Sounds good.  I'll re-roll and give the refactoring another go.
>
> I think we can definitely do better, and more importantly, I
> think we can decouple things by using less globals.
>
> Junio, did you have any comments about patch v2
> "difftool: add support for difftool.prompt config variable"?

I only took a cursory look but it; you did seem to have based it on the
one I queued in 'pu' with a typo-fixup and it looked fine.

Thanks.