Re: Bug in merge (repro included)
From: Thomas Börkel <tbo_at_ap-ag.com>
Date: 2005-02-04 07:50:04 CET
HI!
"Sander Striker" <striker@apache.org> wrote in message
> GNU diff3 is not the same as Subversion. The results may differ.
IMHO, the diff between B1 and B2 can be seen in 2 different ways:
1. Respecting whitespaces (see the unified diff)
2. Ignoring whitespaces
AFAIK, svn merge does not ignore whitespaces. But then it has not only to
Thomas
---------------------------------------------------------------------
|
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.