RE: Bug in merge (repro included)

> From: Ben Collins-Sussman [mailto:sussman@collab.net]
> Sent: Thursday, February 03, 2005 5:47 PM

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

Not nessecarily. Our range of conflict is smaller. We could make this
configurable. It only affects the output function, calculating what
the common parts are doesn't change.

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

GNU diff3 is not the same as Subversion. The results may differ.
I don't feel it is wrong per se.

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Feb 3 18:28:23 2005