From: Charles Bailey <charles@hashpling.org>
To: Scott Chacon <schacon@gmail.com>
Cc: git list <git@vger.kernel.org>
Subject: Re: [PATCH] mergetool--lib: add p4merge as a pre-configured mergetool option
Date: Tue, 27 Oct 2009 23:00:43 +0000 [thread overview]
Message-ID: <20091027230043.GA11607@hashpling.org> (raw)
In-Reply-To: <d411cc4a0910271536u5817802at43f7477dd8ccabc7@mail.gmail.com>
On Tue, Oct 27, 2009 at 03:36:49PM -0700, Scott Chacon wrote:
> p4merge is now a built-in diff/merge tool.
> This adds p4merge to git-completion and updates
> the documentation to mention p4merge.
> ---
I approve (but haven't had a chance to test this). p4merge is a
good mergetool, but now I'll have to find something else as an example
that you need to use custom mergetool support for.
I'm just wondering, does this work well with unixes and Mac OS X? I
think it's recommended install practice to symlink p4v as p4merge on
*nix, but Mac OS X needs some sort of 'launchp4merge' to be called
IIRC, or is this something that users can just configure with
mergetool.p4diff.path?
--
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
next prev parent reply other threads:[~2009-10-27 23:10 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 [this message]
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
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=20091027230043.GA11607@hashpling.org \
--to=charles@hashpling.org \
--cc=git@vger.kernel.org \
--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 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).