From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 03 Mar 2012 22:47:07 GMT
Subject: Re: [PATCH v2] mergetools: add support for DeltaWalker
Message-ID: <7vmx7x5ml0.fsf@alter.siamese.dyndns.org>
In-Reply-To: <CAJDDKr4q7gmFeHuGM5hFruduHw-3mGa+CMU=U6X0jjXUsJLsvw@mail.gmail.com>

David Aguilar <davvid@gmail.com> writes:

>>> +merge_cmd () {
>>> +     if $base_present
>>> +     then
>>> +             "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$PWD/$MERGED"
>>> +     else
>>> +             "$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$PWD/$MERGED"
>>> +     fi >/dev/null 2>&1
>>> +}
>
> Is the $PWD/ prefix strictly needed?  The rest of the mergetools use
> $MERGED as-is.  Does it work without it?

Hrm, I didn't notice it but they do look fishy.  Thanks for good eyes.

Tim?