# HG changeset patch
# User Pascal Quantin <pascal.quantin@gmail.com>
# Date 1232214700 -3600
# Node ID 950484f05f162ec36e6a66cb498569747a1aa95c
# Parent  3cc74ee75b0d109d63df4d09d2eb2aa08ee36204
Update win32 merge tools configuration

Add WinMerge and Beyond Compare 3 to default merge tools configuration.
Fix TortoiseMerge configuration.

diff -r 3cc74ee75b0d -r 950484f05f16 contrib/mergetools.hgrc
--- a/contrib/mergetools.hgrc	Tue Jan 13 20:28:06 2009 +0200
+++ b/contrib/mergetools.hgrc	Sat Jan 17 18:51:40 2009 +0100
@@ -38,8 +38,9 @@
 p4merge.gui=True
 p4merge.priority=-8
 
-tortoisemerge.args=/base: $output /mine:$local /theirs:$other /merged:$output
+tortoisemerge.args=/base:$base /mine:$local /theirs:$other /merged:$output
 tortoisemerge.regkey=Software\TortoiseSVN
+tortoisemerge.checkchanged=True
 tortoisemerge.gui=True
 
 ecmerge.args=$base $local $other --mode=merge3 --title0=base --title1=local --title2=other --to=$output
@@ -49,3 +50,13 @@
 filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
 filemerge.args=-left $other -right $local -ancestor $base -merge $output
 filemerge.gui=True
+
+beyondcompare3.executable=C:\Program Files\Beyond Compare 3\BComp.exe
+beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts
+beyondcompare3.gui=True
+
+winmerge.args=/e /u /dl local /dr other /wr $local $other $output
+winmerge.regkey=Software\Thingamahoochie\WinMerge
+winmerge.regname=Executable
+winmerge.checkchanged=True
+winmerge.gui=True