Re: [PATCH] mergetool--lib: add p4merge as a pre-configured mergetool option
- From
Markus Heidelberg <markus.heidelberg@web.de>
- Date
- Oct 30, 2009, 10:35 UTC
- Message-ID
- <200910301135.59831.markus.heidelberg@web.de>
- In-Reply-To
- <76718490910292000t7b024b83y68d71b6ff810c15@mail.gmail.com>
Jay Soffian, 30.10.2009:
Show 17 quoted lines
> On Thu, Oct 29, 2009 at 9:02 PM, Markus Heidelberg > <markus.heidelberg@web.de> wrote: > > He didn't mean p4merge on other platforms, but other merge tools on Mac > > OS X. What about all the other merge tools already in mergetool--lib? > > Should they get special handling, too? > > If someone wants to scratch that itch, then yes. The default diff tool > for OS X has its helper already in /usr/bin (opendiff). p4merge is > arguably a better merge tool, and it installs as an app bundle in > /Applications. I'm not sure about the other diff tools, I haven't > looked. > > > And for Windows we could add C:\Program Files\MergeToolX\tool.exe for > > every merge tool. > > If it makes those tools easier to use with git, and if someone on > Windows wants to scratch that itch, then yes, we should.
Another possible problem: the user can change the installation destination on Windows. What's the behaviour of Mac OS here? Is the instalation path fixed or changeable?
Markus