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

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

From: Sascha Bohnenkamp <bohnenkamp_at_mevisbreastcare.de>
Date: 2006-10-09 09:26:12 CEST

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.

It would hae to use the latest version and diff it against the local one.
And after having resolved it store it accordingly

any ideas?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Oct 9 09:30:32 2006

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