Mercurial > public > mercurial-scm > hg

diff contrib/mergetools.hgrc @ 22461:864bc2f4279b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib: add OS X p4merge to mergetools.hgrc
author Mads Kiilerich <madski@unity3d.com>
date Wed, 27 Aug 2014 16:39:44 +0200
parents 33020e87f8c5
children
line wrap: on
line diff
--- 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