Re: Diff incorrect detects complete file different

On Wed, 13 Apr 2005, Greg Irvine wrote:

> The merging is detecting that the full contents of two files is different.
> i.e. it's showing the entire contents of the working file between "<<<<
> .working" and the "====== " and the incoming file after to the trailing
> ">>>>>".
>
>
>
> If I divide the two sections into two files and run a diff on that (unix
> diff command), it correctly only shows the line by line differences.
>
>
>
> I've ensured the files are both using unix end-of-lines.
>
And you're sure there a not just whitespace differences (or tabs being
converted to spaces or something)?
>
> Thanks for any advice.
>
Could you send small example files where this happens? You need to send
all three versions fof the file.

Regards,
//Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Apr 13 09:14:28 2005