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

Re: Strange conflicts during merge

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-05-20 17:06:26 CEST

Philip Martin <philip@codematters.co.uk> writes:

> > Indeed, it's a bug with merges that add binary files. The problem
> > above can be reproduced
>
> I've raised issue 1319.

Look, everyone! Philip threw an exception! :-)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 20 17:08:12 2003

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

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