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

RE: Re: binary files & merges

From: Bill Tutt <rassilon_at_lyra.org>
Date: 2002-03-15 19:36:28 CET

Ditto. Binary files always conflict. Reducing the conflict is for a time
when we implement a client side system to solve merge issues based on
MIME type.

Bill

----
Do you want a dangerous fugitive staying in your flat?
No.
Well, don't upset him and he'll be a nice fugitive staying in your flat.
 
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Mar 15 19:37:47 2002

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