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

Re: Bug in merge (repro included)

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-02-03 17:47:21 CET

Sander Striker: what do you think? Is this a bug in our diff3
algorithm?

Thomas says that GNU diff3 produces a conflict with these files also.

On Feb 3, 2005, at 8:36 AM, Thomas Börkel wrote:

> HI!
>
> As requested by Ben Collins-Sussman, I am reposting this from the
> users list to the dev list.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Feb 3 17:50:58 2005

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