"these files use different carriage return types" error when viewing po files with winmerge

[Mohsen Sajjadi]

hi, i am seeing the above error everytime i do a diff since eol-style
has been set to native, this isn't a problem, is it? why has eol-style
been set to native anyway (just out of my curiosity)?

thanks
mohsen

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-uns...@tortoisesvn.tigris.org
For additional commands, e-mail: dev-...@tortoisesvn.tigris.org

[Lübbe Onken | RA Consulting]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Mohsen,

You wrote:

> hi, i am seeing the above error everytime i do a diff since eol-style
> has been set to native, this isn't a problem, is it? why has eol-style
> been set to native anyway (just out of my curiosity)?

Eol-style:native forces the "correct" eol-style for the target system. If you check out on unix, you will get CR as eol character, on Windows CRLF, on Mac LF.

Please check your poedit settings. Probably poedit is set to "Unix" (LF) linebreaks. Set it to "Windows" and you should be fine.

Cheers
- - Lübbe

- --
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)

iD4DBQFIV6dwm8gezyP1EasRAoJ6AJ9dLvwuzRew2CGWiqZxXJRp9h+TMACWIMch
iX5UZ7prDTfbGEDdj3AC7A==
=Qtk2
-----END PGP SIGNATURE-----