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

Re: Forcing conflict on a three-way diff.

From: Erik Enge <eenge_at_prium.net>
Date: 2005-09-15 22:11:10 CEST

Quoting Ben Collins-Sussman <sussman@collab.net>:

> Just set the file's svn:mime-type property to something non-texty,
> like application/octet-stream.

Ok, thanks. Is that the only side-effect of doing this or should
I be aware of anything else? Is this the official way of disabling
three-way diffs or are there plans/thoughts on perhaps doing this
in some other way in the future?


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 15 22:12:59 2005

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

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