Show More
| @@ -15,7 +15,7 b'' | |||
|
|
15 | 15 | ; |
|
|
16 | 16 | araxis.args=/3 /a2 /wait /merge /title1:"Other" /title2:"Base" /title3:"Local :"$local $other $base $local $output |
|
|
17 | 17 | araxis.binary=True |
|
|
18 | araxis.checkconflict=True | |
|
|
18 | araxis.checkconflicts=True | |
|
|
19 | 19 | araxis.diffargs=/2 /wait /title1:$plabel1 /title2:$clabel $parent $child |
|
|
20 | 20 | araxis.gui=True |
|
|
21 | 21 | araxis.priority=-2 |
General Comments 0
You need to be logged in to leave comments.
Login now