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

mergetools: fix typo in araxis config

Thanks to amadawn for reporting

Changeset 3ea398f47314…

Parent 4c461c75be7b…

by Steve Borho

Changes to one file · Browse files at 3ea398f47314 Showing diff from parent 4c461c75be7b Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​mergetools.ini Stacked
 
17
18
19
20
 
21
22
23
 
17
18
19
 
20
21
22
23
@@ -17,7 +17,7 @@
 araxis.priority=-2  araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output  araxis.premerge=False -araxis.checkconlict=True +araxis.checkconflict=True  araxis.binary=True  araxis.gui=True  araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child