Mercurial > hg

comparison contrib/mergetools.hgrc @ 7683:39ae4fb8cf17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Retrieve Beyond Compare's path from registry Switch from a hardcoded path to registry key to find Beyond Compare's executable. Calling BCompare.exe works fine with version 3.0.14.
author Pascal Quantin <pascal.quantin@gmail.com>
date Fri, 23 Jan 2009 23:39:28 +0100
parents 950484f05f16
children e48cc2315fe6
comparison
equal deleted inserted replaced
7682:9c8bbae02e9c 7683:39ae4fb8cf17
49 49
50 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge 50 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
51 filemerge.args=-left $other -right $local -ancestor $base -merge $output 51 filemerge.args=-left $other -right $local -ancestor $base -merge $output
52 filemerge.gui=True 52 filemerge.gui=True
53 53
54 beyondcompare3.executable=C:\Program Files\Beyond Compare 3\BComp.exe
55 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts 54 beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts
55 beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3
56 beyondcompare3.regname=ExePath
56 beyondcompare3.gui=True 57 beyondcompare3.gui=True
57 58
58 winmerge.args=/e /u /dl local /dr other /wr $local $other $output 59 winmerge.args=/e /u /dl local /dr other /wr $local $other $output
59 winmerge.regkey=Software\Thingamahoochie\WinMerge 60 winmerge.regkey=Software\Thingamahoochie\WinMerge
60 winmerge.regname=Executable 61 winmerge.regname=Executable