[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: [TSVN] TortoiseSVN - FAQ

From: Lübbe Onken <l.onken_at_rac.de>
Date: 2005-02-07 09:24:41 CET

> User: Andrew, mailto:amyust@mail.ru
> Categories: English
>
> How I can integrate Araxis Merge as tool for diff&merg in TortoiseSVN?

Hi Andrew,

Go to the TortoiseSVN settings page, diff / merge tab and specify the path
to your diff tool. Find out in which order your diff tool requires the file
parameters (%base %mine $merged %theirs) and pass them on the commandline

Cheers
- Lübbe

--
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Feb 7 09:25:40 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.