# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1409150384 -7200
# Node ID 864bc2f4279b44cd51915dc10e7a7395354c825b
# Parent  c343557a84423215d47af9bdefaed62d32de0d9a
contrib: add OS X p4merge to mergetools.hgrc

diff -r c343557a8442 -r 864bc2f4279b contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc	Wed Aug 20 15:15:50 2014 -0400
+++ b/contrib/mergetools.hgrc	Wed Aug 27 16:39:44 2014 +0200
@@ -58,6 +58,12 @@
 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