From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Jan 2013 03:34:17 GMT
Subject: Re: [PATCH v2 3/4] mergetool--lib: Add functions for finding available tools
Message-ID: <7vsj5jmjie.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7vwquvmkon.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> Heh, I actually was hoping that you will send in a replacement for
> David's patch ;-)
>
> Here is what I will squash into the one we have been discussing.  In
> a few hours, I expect I'll be able to push this out in the 'pu'
> branch.

I ended up doing this a bit differently; will push out the result
after merging the other topics to 'pu'.