Re: [TSVN] 'Edit Conflicts' choking

Simon Large wrote:
> I wrote:
>
>>Sounds like you have a unicode file. Diffing unicode files is not
>>(yet) supported. UTF-8 is OK though.
>
>
> Stefan,
>
> TMerge can detect UTF-16LE and UTF-32LE BOMs, although it cannot process
> the data. But the error message it throws out is that the data is
> binary, which is what prompted Alexander's question because the file
> looks like plain text in a unicode-supporting text editor. Can we have a
> separate message to say that 16 and 32 bit unicode formats are not
> supported?

Committed a better error message in revision 2876.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org