Araxis Merge

( CVSSCC )

Type: Public Status:Closed Created: 24 Dec 04 12:00 Updated: 24 Dec 04 12:00

--> Igor Pushkov (admin) at 24 Dec 04 12:00 writes

To use Araxis you should configure it as external executable for
difference and conflict viewer. You can make this in configuration
windows under the "executables page". Or directly at the "Show diffs
dialog". We use Araxis 2001 and our configuration looks like this:
= External Merge/Compare tool
= E:\Program Files\Araxis\Araxis Merge 2001 Professional\Merge.exe
3-way compare mode started automatically if you select more than 3
files/versions in difference or history dialog. For correct
integration with your diff tool (Araxis) it is possible to configure
operand sequence. This can be don in "3-way cmd" field. File names as
arguments represented by tags: "%1" "%2" "%3". You can change their
order or add switches required for your tool.

--> Victor Vostricow (user) at 24 Dec 04 12:00 writes

How to use Araxis Merge with CVSSCC Proxy? I use Araxis 6.5, Athlant 2rc 3
and Delphi 7. In plugin I set use Araxis whenever possible. But when I try
to get difference - I don't see Araxis window opened. My files definitely
different, if I use built-ins - I'll see differences, if I use Araxis as
External tool - I also see differences.
Am I need any additional configuring of Araxis/CVSSCC Proxy?

Also I want to know how to do 3-way merging using Araxis - this feature
mentioned in help.

Rate this ticket:

Not useful at all

Partially useful

Useful

Very useful

Ticket

Araxis Merge