From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Jan 2013 06:05:29 GMT
Subject: Re: [PATCH] mergetools: Simplify how we handle "vim" and "defaults"
Message-ID: <7vpq0rxis6.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAJDDKr692zbg+PiFWx1y81yn=s2e=C0pFhsup4z0uTRNOTMPwg@mail.gmail.com>

David Aguilar <davvid@gmail.com> writes:

>> I think that's much better.
>
> Would you like me to put this together into a proper patch?
>
> You can also squash it in (along with a removal of the
> last line of the commit message) if you prefer.

I was lazy and didn't want to think about rewriting your log
message, so I just queued it with this log message on top.

    mergetools: remove mergetools/include/defaults.sh
    
    This and its containing directory are used only to define trivial
    fallback definition of five shell functions in a single script.
    Defining them in-line at the location that wants to have them makes
    the result much easier to read.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>

But as you said, removing the last line of your log message and
squashing the change into it would be more preferrable.  Let me do
that later.

Thanks.