Commits

Steve Borho  committed 158b214

mergetools: improve araxis merge arguments

Closes #1219

  • Participants
  • Parent commits b7ddf02
  • Branches stable

Comments (0)

Files changed (1)

File contrib/mergetools.rc

 araxis.regappend=\ConsoleCompare.exe
 ;araxis.executable=${ProgramFiles}/Araxis/Araxis Merge/ConsoleCompare.exe
 araxis.priority=-2
-araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output
+araxis.args=/3 /a2 /wait /merge /title1:"Parent 1" /title2:"Merge Result: "$output /title3:"Parent 2" $local $base $other $output
 araxis.premerge=False
 araxis.checkconflict=True
 araxis.binary=True