Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.0, 1.0.1, and 1.0.2

stable mergetools: fix copy-paste-error in bcompare config

Changeset d2ec324d789c…

Parent 750baafa3680…

by Steve Borho

Changes to one file · Browse files at d2ec324d789c Showing diff from parent 750baafa3680 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​mergetools.ini Stacked
 
100
101
102
103
 
104
105
106
 
100
101
102
 
103
104
105
106
@@ -100,7 +100,7 @@
 ; Linux only diff tools, listed here for reference  bcompare.priority=-1  bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo -beyondcompare3.premerge=False +bcompare.premerge=False  bcompare.gui=True  bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child  bcompare.diff3args=$parent1 $parent2 $child -lefttitle='$plabel1' -centertitle='$clabel' -righttitle='$plabel2' -solo -expandall