83 beyondcompare3.priority=-2

    83 beyondcompare3.priority=-2

    84 beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child

    84 beyondcompare3.diffargs=/lro /lefttitle='$plabel1' /righttitle='$clabel' /solo /expandall $parent $child

    85 

    85 

    86 ; Linux version of Beyond Compare

    86 ; Linux version of Beyond Compare

    87 bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo

    87 bcompare.args=$local $other $base -mergeoutput=$output -ro -lefttitle=parent1 -centertitle=base -righttitle=parent2 -outputtitle=merged -automerge -reviewconflicts -solo

    89 bcompare.gui=True

    88 bcompare.gui=True

    90 bcompare.priority=-1

    89 bcompare.priority=-1

    91 bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child

    90 bcompare.diffargs=-lro -lefttitle='$plabel1' -righttitle='$clabel' -solo -expandall $parent $child

    92 

    91 

    93 winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output

    92 winmerge.args=/e /x /wl /ub /dl other /dr local $other $local $output

   101 

   100 

   102 araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR

   101 araxis.regkey=SOFTWARE\Classes\TypeLib\{46799e0a-7bd1-4330-911c-9660bb964ea2}\7.0\HELPDIR

   103 araxis.regappend=\ConsoleCompare.exe

   102 araxis.regappend=\ConsoleCompare.exe

   104 araxis.priority=-2

   103 araxis.priority=-2

   105 araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output

   104 araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output

   107 araxis.checkconflict=True

   105 araxis.checkconflict=True

   108 araxis.binary=True

   106 araxis.binary=True

   109 araxis.gui=True

   107 araxis.gui=True

   110 araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child

   108 araxis.diffargs=/2 /wait /title1:"$plabel1" /title2:"$clabel" $parent $child

   111 

   109