From: Scott Chacon <schacon@gmail.com>
Date: Wed, 28 Oct 2009 15:37:06 GMT
Subject: Re: [PATCH] mergetool--lib: add p4merge as a pre-configured mergetool option
Message-ID: <d411cc4a0910280837h52596089je9ab4d03383d43cc@mail.gmail.com>
In-Reply-To: <20091028090022.GA90780@gmail.com>

Hey,

On Wed, Oct 28, 2009 at 2:00 AM, David Aguilar <davvid@gmail.com> wrote:
>> 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?
>
> I just tested this on Mac OS X with the latest version of
> p4merge.  It worked great.
>
>        $ git config difftool.p4merge.path \
>          /Applications/p4merge.app/Contents/MacOS/p4merge
>
>        $ git difftool -t p4merge HEAD^
>

This is how I have it setup as well and both diff and merge work for
me.  I had to do a weird thing with passing it $LOCAL twice if there
was no merge base since otherwise it does a diff tool instead of a
merge tool - the difference is based on the number of arguments, but
it seems to work pretty well.  I can try it on Linux a bit later, but
I'm not sure why launchp4merge would be needed instead of setting the
path like this on a Mac - if there is no serious objection, I can
resend this with my Signed-Off-By (sorry, I forgot).

Thanks,
Scott