TortoiseMerge gives "inconsistent newline" error when file ends with EOF character (0x1A)

Hi,

TortoiseMerge gives the message "Cannot show diff because of
inconsistent newline in the file" on files that do not have inconsistent
newlines. All of the affected files that I have been able to find in
our repository are ended with the EOF character (0x1A), but some files
that do have that character are not affected.

I have managed to reproduce this with short text files. To a test
repository, I added a file containing (where <EOF> represents the
character 0x1A):

Spoo
Flarn
Breen
<EOF>

I then changing that file to read:

Spoo
Flarn
Swedish Meatballs
<EOF>

I then committed it to the repository, went to check the log, and from
there chose "Show differences" on that file.

"Blame differences" and "Show differences as unified diff" work fine.

I am using TortoiseSVN Build 8132.

-- 
Doug Spence
Nitrex Metal Inc.
*********************************************************
 NOTICE:  This e-mail and any attachment(s) may contain 
 confidential  and  proprietary information of Nitrex
 Metal Inc. and/or its subsidiaries and may be legally
 privileged.
 This  e-mail is intended  solely for  the addressee.
 If  you  are not  the  addressee, dissemination, 
 copying or other use of this  e-mail or any of  its
 content is strictly prohibited and may be unlawful. If
 you are not the intended recipient please inform the
 sender immediately and destroy the e-mail and any
 copies.
 All liability for viruses is excluded to the fullest
 extent permitted by law.  Any views expressed in this
 message are those of the individual sender.
 No contract may be construed by this e-mail.
*********************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org