Merging two different versions of a file does not mark correctly the differences between the files

     I have already posted another thread with a similar topic, but the
received answers were not satisfactory.
     What I am trying to do is to merge a tag with my working trunk. The merge
operation is very difficult because between two versions, the entire file is
marked as different, even if in reality only several lines differ. Also,
using diff utility from Linux correctly gives the difference between the two
files. I have attached a small example with this issue. Could someone explain
what is wrong?

I am using svn 1.5.4 compiled from sources on openSuSE 10.3 32 bits

regards

-- 
Bogdan Cristea

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org