Re: BUG: TortoiseMerge encoding (UTF-8)

Andreas Schnederle-Wagner - Futureweb.at wrote:
> Hello all,
>
> i found a very annoyingly encoding Bug in TortoiseMerge. All our
> Files are saved in UTF-8 without BOM. I got several Branches of our
> main development tree. Everytime when I MERGE the branches with the
> main development tree and fix the conflicts with the TortoiseMerge
> Client (Windows) the resulting File is saved in ASCII LF (original
> was UTF8 CRLF) and all special characters are broken since the file
> isn't UTF-8 anymore.

Which version of TSVN are you using?
TortoiseMerge shows the encoding at the bottom in the status bar. What
does it say there?

Stefan

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