missing end of line problem

I also found some problems with files missing end-of-lines when comparing.
Specifically:
1) I check out a file (say xx.cs version 1.1) to two differente locations
with both Vs.Net and TortoiseCVS
2) I modify xx.cs in my Tortoise location, adding several lines
at the end. The last line does not include the newline terminator
(UltraEdit allows this...). I checkin xx.cs (version 1.2)
3) I add other different bunch of lines at the end of xx.cs in Vs.Net
4) When I attempt to check in from Vs.Net, conflict (naturally) arises.
The CvsMerge window misses the last line from the v 1.2 file.