Re: What files can be automatically merged?

On 5/10/06, Edward Harvey <eharvey@chilsemi.com> wrote:
> 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?

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.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed May 10 17:19:11 2006