From: Markus Heidelberg <markus.heidelberg@web.de>
To: Jay Soffian <jaysoffian@gmail.com>
Cc: Reece Dunn <msclrhd@googlemail.com>,
Charles Bailey <charles@hashpling.org>,
Scott Chacon <schacon@gmail.com>, git list <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
David Aguilar <davvid@gmail.com>
Subject: Re: [PATCH] mergetool--lib: add p4merge as a pre-configured mergetool option
Date: Fri, 30 Oct 2009 16:30:29 +0100 [thread overview]
Message-ID: <200910301630.30420.markus.heidelberg@web.de> (raw)
In-Reply-To: <76718490910300817w776bde48j40de31e5532b9fd4@mail.gmail.com>
Jay Soffian, 30.10.2009:
> On Fri, Oct 30, 2009 at 7:25 AM, Reece Dunn <msclrhd@googlemail.com> wrote:
> > 3/ try some intelligent guessing
>
> This is basically what is already done, but (3) isn't yet platform
> specific in any way
Maybe this can be considered to be implemented. But since it's not
p4merge specific, the p4merge patch should firstly be applied without
the intelligence.
The intelligence may be implemented mergetool agnostic for all at once,
if that is possible?
Markus
next prev parent reply other threads:[~2009-10-30 15:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-27 22:36 [PATCH] mergetool--lib: add p4merge as a pre-configured mergetool option Scott Chacon
2009-10-27 23:00 ` Charles Bailey
2009-10-28 7:18 ` Junio C Hamano
2009-10-28 9:00 ` David Aguilar
2009-10-28 15:37 ` Scott Chacon
2009-10-28 21:39 ` Scott Chacon
2009-10-28 23:37 ` Junio C Hamano
2009-10-29 6:17 ` Jay Soffian
2009-10-29 22:12 ` Charles Bailey
2009-10-30 0:47 ` Jay Soffian
2009-10-30 1:02 ` Markus Heidelberg
2009-10-30 3:00 ` Jay Soffian
2009-10-30 10:35 ` Markus Heidelberg
2009-10-30 11:25 ` Reece Dunn
2009-10-30 15:17 ` Jay Soffian
2009-10-30 15:30 ` Markus Heidelberg [this message]
2009-10-30 17:44 ` Charles Bailey
2009-10-30 18:54 ` Junio C Hamano
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=200910301630.30420.markus.heidelberg@web.de \
--to=markus.heidelberg@web.de \
--cc=charles@hashpling.org \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jaysoffian@gmail.com \
--cc=msclrhd@googlemail.com \
--cc=schacon@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.