From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Jan 2013 03:02:47 GMT
Subject: Re: [PATCH] fixup! mergetools: simplify how we handle "vim" and "defaults"
Message-ID: <7vy5fcu1wo.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAJDDKr5wsYqnBk+kvKj1qzUYKJBJ5nAiwMJZ=HpzPPgJf8BBTQ@mail.gmail.com>

David Aguilar <davvid@gmail.com> writes:

> On Mon, Jan 28, 2013 at 11:28 AM, John Keeping <john@keeping.me.uk> wrote:
>> ---
>> Junio, please can you squash this into f9924e5 on jk/mergetool,
>> providing that David is OK with that?
>
> This looks good to me.

Thanks for a quick response.  Will squash this in and rebuild the
two affected branches.