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

RE: Automatic conflict resolution

From: Gavin Lambert <gavinl_at_compacsort.com>
Date: 2005-11-24 22:44:23 CET

Quoth Sjoerd Tieleman <mailto:sjoerd.tieleman@phil.uu.nl>:
> That's exactly the point. We would like some tools that could
> work in cases where merges of line-based structures aren't
> good enough.

Well, I know this isn't the Tortoise list, but in TortoiseSVN you can
configure different diff/merge tools based on file extension...

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Nov 24 22:46:11 2005

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

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