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

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

mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3
Mads Kiilerich -
r26733:f6e2e42f default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -88,6 +88,10 b' filemerge.executable=/Developer/Applicat'
88 filemerge.args=-left $other -right $local -ancestor $base -merge $output
88 filemerge.args=-left $other -right $local -ancestor $base -merge $output
89 filemerge.gui=True
89 filemerge.gui=True
90
90
91 filemergexcode.executable=/Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge
92 filemergexcode.args=-left $other -right $local -ancestor $base -merge $output
93 filemergexcode.gui=True
94
91 ; Windows version of Beyond Compare
95 ; Windows version of Beyond Compare
92 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
96 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo
93 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
97 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
General Comments 0
You need to be logged in to leave comments. Login now