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

What files can be automatically merged?

From: Edward Harvey <eharvey_at_chilsemi.com>
Date: 2006-05-10 16:52:44 CEST

I know .txt files can.
I know .doc files can't.

Is there a list someplace? Or a characteristic I can look for?

Is automatic merging part of TortoiseMerge, or TortoiseSVN, or part of
subversion itself?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed May 10 16:53:08 2006

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.