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

RE: Re: What files can be automatically merged?

From: Edward Harvey <eharvey_at_chilsemi.com>
Date: 2006-05-10 18:13:38 CEST

> Plain-text files can be auto-merged. Binary files cannot.
> This is coded in the SVN libraries (which TSVN uses), but the
> svn:mime-type property is a big helper here in telling the
> libraries what files can be automatically merged.

I see that I can change the mime-type property. But how does it
originally get set?

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed May 10 18:14:18 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.