On Wed, 17 May 2000, Borrione Aldo wrote:

> By the way, is it possible to integrate in WinCVS an external merge
> tool ( such as AraxisMerge ) the same way it is possible to integrate
> an external diff tool

I installed AraxisMerge 2000 two days ago to test out, and frankly I'm
impressed.  I'm currently merging one branch into another branch before
mergeing that branch into the main trunk.

With AraxisMerge I just sit in the sandox with the 'ado' branch and diff
the files against 'pre-ado-fixes'.  AraxisMerge has a nice feature of
merging individual changes from one file to the other by clicking on the
little box in the top right of the diff area, ctrl-clicking deletes the
change.  VERY handy.  If only AraxisMerge was a cheaper I'd be more
inclined to put an order in at work.

Mark

Reply via email to