--- a/contrib/mergetools.hgrc Wed Apr 16 03:05:00 2014 +0900
+++ b/contrib/mergetools.hgrc Thu Apr 17 14:54:46 2014 +0200
@@ -85,7 +85,6 @@
; Linux version of Beyond Compare
bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo
-bcompare.premerge=False
bcompare.gui=True
bcompare.priority=-1
bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child
@@ -103,7 +102,6 @@
araxis.regappend=\ConsoleCompare.exe
araxis.priority=-2
araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output
-araxis.premerge=False
araxis.checkconflict=True
araxis.binary=True
araxis.gui=True