Mercurial > hg

comparison mercurial/default.d/mergetools.rc @ 26733:f6e2e42fb8ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergetools.rc: find OSX FileMerge in the new location inside Xcode 4.3
author Mads Kiilerich <madski@unity3d.com>
date Fri, 16 Oct 2015 11:37:34 +0200
parents 14d647d25c70
children a9802c9ecfb5
comparison
equal deleted inserted replaced
26732:69ac9aebbc55 26733:f6e2e42fb8ef
86 86
87 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge 87 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
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
94 beyondcompare3.regname=ExePath 98 beyondcompare3.regname=ExePath
95 beyondcompare3.gui=True 99 beyondcompare3.gui=True