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

RE: integration of two-way merge (edit conflicts) tool possible?

From: Lübbe Onken <l.onken_at_rac.de>
Date: 2006-10-09 15:19:28 CEST

Sascha Bohnenkamp wrote:
> Hi
>
> we are using BeyondCompare from scootersoft heavily in our company.
> Most of our developers do like this tool for diff, merge etc.
> much more
> than the one integration into tortoise.
> Is there a way to integrate such tool for "edit-conflicts" too?
> I was not abl to do it yet.

TortoiseSVN->Settings->External Tools->Diff
TortoiseSVN->Settings->External Tools->Merge

Pay attention to the ballon tips. They tell you which parameters you cann
pass on the command line.

Cheers
- Lübbe

--
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Oct 9 15:19:36 2006

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