##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

contrib: add OS X p4merge to mergetools.hgrc
Mads Kiilerich -
r22461:864bc2f4 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -58,6 +58,12 b' p4merge.gui=True'
58 p4merge.priority=-8
58 p4merge.priority=-8
59 p4merge.diffargs=$parent $child
59 p4merge.diffargs=$parent $child
60
60
61 p4mergeosx.executable = /Applications/p4merge.app/Contents/MacOS/p4merge
62 p4mergeosx.args = $base $local $other $output
63 p4mergeosx.gui = True
64 p4mergeosx.priority=-8
65 p4mergeosx.diffargs=$parent $child
66
61 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
67 tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
62 tortoisemerge.regkey=Software\TortoiseSVN
68 tortoisemerge.regkey=Software\TortoiseSVN
63 tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN
69 tortoisemerge.regkeyalt=Software\Wow6432Node\TortoiseSVN
General Comments 0
You need to be logged in to leave comments. Login now