From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "SZEDER Gábor" <szeder@ira.uka.de>,
"Phil Susi" <phillsusi@gmail.com>,
git@vger.kernel.org, "Philip Oakley" <philipoakley@iee.org>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>,
"Sebastian Schuberth" <sschuberth@gmail.com>
Subject: Re: [PATCH v6 2/2] mergetools: add winmerge as a builtin tool
Date: Fri, 22 May 2015 13:16:07 -0700 [thread overview]
Message-ID: <20150522201606.GB26066@gmail.com> (raw)
In-Reply-To: <xmqqr3q8e5tj.fsf@gitster.dls.corp.google.com>
On Fri, May 22, 2015 at 01:05:28PM -0700, Junio C Hamano wrote:
> David Aguilar <davvid@gmail.com> writes:
>
> > [just wrapping up the unaswered questions in this thread]
> > ...
> > On Wed, May 20, 2015 at 01:09:29PM +0200, SZEDER Gábor wrote:
>
> Thanks for clarifications. I think all is good now?
Yes, I think so. I just looked at what you have queued in pu
and it looks good.
Thanks all,
--
David
next prev parent reply other threads:[~2015-05-22 20:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-20 9:07 [PATCH v6 1/2] mergetool--lib: set IFS for difftool and mergetool David Aguilar
2015-05-20 9:07 ` [PATCH v6 2/2] mergetools: add winmerge as a builtin tool David Aguilar
2015-05-20 11:09 ` SZEDER Gábor
2015-05-22 19:58 ` David Aguilar
2015-05-22 20:05 ` Junio C Hamano
2015-05-22 20:16 ` David Aguilar [this message]
2015-05-20 20:13 ` Junio C Hamano
2015-05-20 20:20 ` Sebastian Schuberth
2015-05-20 21:00 ` Junio C Hamano
2015-05-20 21:20 ` Sebastian Schuberth
2015-05-21 10:06 ` Johannes Schindelin
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=20150522201606.GB26066@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=philipoakley@iee.org \
--cc=phillsusi@gmail.com \
--cc=sschuberth@gmail.com \
--cc=szeder@ira.uka.de \
/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).