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

Re: Conflict Resolve Issue 1:

From: Anthony <tortoisesvn_at_gray-team.com>
Date: 2007-10-05 23:58:40 CEST

> Yes, it's is normal and has nothing to do with TSVN or
>Subversion -
> it's a KDiff3 feature that's enabled by default. To
>disable it go to
> the menu "Settings", then "Directory Merge" tab, then
>"Backup files
> (.orig)" checkbox. But I rather leave it enabled.

PERFECT! -Thanks-

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Oct 5 23:59:43 2007

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

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