Patchwork contrib: add OS X p4merge to mergetools.hgrc

login
register
mail settings
Submitter Mads Kiilerich
Date Aug. 29, 2014, 9:58 a.m.
Message ID <75cb36c761b37c16663f.1409306294@localhost.localdomain>
Download mbox | patch
Permalink /patch/5620/
State Accepted
Headers show

Comments

Mads Kiilerich - Aug. 29, 2014, 9:58 a.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1409150384 -7200
#      Wed Aug 27 16:39:44 2014 +0200
# Node ID 75cb36c761b37c16663fa31f60d010d5a38c91d4
# Parent  926bc0d3b595caf37c5d70833a347eb43285de2f
contrib: add OS X p4merge to mergetools.hgrc
Pierre-Yves David - Sept. 18, 2014, 12:06 a.m.
On 08/29/2014 05:40 AM, Kevin Bullock wrote:
> On Aug 29, 2014, at 11:58 AM, Mads Kiilerich <mads@kiilerich.com> wrote:
>
>> # HG changeset patch
>> # User Mads Kiilerich <madski@unity3d.com>
>> # Date 1409150384 -7200
>> #      Wed Aug 27 16:39:44 2014 +0200
>> # Node ID 75cb36c761b37c16663fa31f60d010d5a38c91d4
>> # Parent  926bc0d3b595caf37c5d70833a347eb43285de2f
>> contrib: add OS X p4merge to mergetools.hgrc
>
> Looks fine to me. Crew at will.

pushed to the clowncopter

Patch

diff --git a/contrib/mergetools.hgrc b/contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc
+++ b/contrib/mergetools.hgrc
@@ -58,6 +58,12 @@  p4merge.gui=True
 p4merge.priority=-8
 p4merge.diffargs=$parent $child
 
+p4mergeosx.executable = /Applications/p4merge.app/Contents/MacOS/p4merge
+p4mergeosx.args = $base $local $other $output
+p4mergeosx.gui = True
+p4mergeosx.priority=-8
+p4mergeosx.diffargs=$parent $child
+
 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
 tortoisemerge.regkey=Software\TortoiseSVN
 tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN