Re: Bug in merge (repro included)

On Feb 2, 2005, at 9:07 AM, Thomas Börkel wrote:
>
>
> The code in the trunk looks slightly different there, so IMHO the merge
> should result in a conflict (trying with GNU patch results in a
> failure).
>
> But it doesn't. After the merge, the new block has just been added
> without
> conflict and the old block has not been removed.
>

GNU diff and patch is doing only a 2-way diff, but 'svn merge' is doing
a 3-way comparison. What does GNU diff3 do with the 3 files?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Feb 2 17:37:19 2005