Re: [TSVN] 'Edit Conflicts' choking

Alexander Garden wrote:
> I do, however, have a problem. When I select 'Edit Conflicts' on a
> file with conflicts, TortoiseMerge gives me the following error:
> The File
> C:\Documents and Settings\Garden\Desktop\OtherCheckout
> \createstuff.sql.r9 is not a valid text file!
>
> The file is there and it is text and it does look correct. I
> downloaded the nightly build but the problem persists. Didn't find
> anything in the FAQ. Hints?

Sounds like you have a unicode file. Diffing unicode files is not (yet)
supported. UTF-8 is OK though.

Simon

-- 
       ___
  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