From: Junio C Hamano <gitster@pobox.com>
To: David Aguilar <davvid@gmail.com>
Cc: Tim Henigan <tim.henigan@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [PATCH v2] mergetools: add support for DeltaWalker
Date: Sat, 03 Mar 2012 14:47:07 -0800 [thread overview]
Message-ID: <7vmx7x5ml0.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CAJDDKr4q7gmFeHuGM5hFruduHw-3mGa+CMU=U6X0jjXUsJLsvw@mail.gmail.com> (David Aguilar's message of "Sat, 3 Mar 2012 14:00:17 -0800")
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?
next prev parent reply other threads:[~2012-03-03 22:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-02 13:27 [PATCH v2] mergetools: add support for DeltaWalker Tim Henigan
2012-03-02 22:39 ` Junio C Hamano
2012-03-03 22:00 ` David Aguilar
2012-03-03 22:47 ` Junio C Hamano [this message]
2012-03-04 3:50 ` Tim Henigan
2012-03-05 2:10 ` David Aguilar
2012-03-05 2:38 ` Junio C Hamano
2012-03-05 14:22 ` Tim Henigan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vmx7x5ml0.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=tim.henigan@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).