Re: BUG:"Cannot show diff because of inconsistent newlines in the file"

Chang Ted wrote:
>> Can you send two files to diff which show the problem, but please zip
>> the files so the encoding is kept and not messed with in the mailer.
>
>> Stefan
>
> Hi,
> here are the sample files, I zipped 3 files in 'sample_code.zip' and attached.
>
> In the zip file,
> 'bad1.php' and 'bad2.php' both contains the bad character
> and the 'clean.php' is just a normal file.
>
> diff any two of them should show the problem.

Seems I can't reproduce the problem here. At least I don't get the error
message, but I get garbled chars shown instead.

TortoiseMerge does not support Big-5 encoding. Only ANSI (local
codepage), UTF-8 and UTF-16.

If you need TMerge to handle Big-5 encoding, feel free to check out the
sourcecode and implement this yourself - I can't really do it since I
can't test it.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net