Convert Unix to Dos/Windows for C++

[stolenrays]

I'm trying to merge to C++ files, but one is Unix and the other is Dos/Windows. Winmerge shows them as completely different and the size of the font seems different as well because of this, but I cannot change that. Any tips?

 

[Asaf]

In notepad++ you can change this: Open the file and use 'Edit --> EOL conversions'.

 

[stolenrays]

Thanks, that did it.