[jcvs] Merging with jCVS under Windoze

[Andreas Ernst <Andreas.Ernst@cmis.CSIRO.AU>]

Hi,

This sounds like it might be a FAQ but I haven't found any FGA
(frequently given answers) on the jCVS web or in the
documentation: When merging a modified file under windows-NT, if
there are conflicts, jCVS seems to just produce a file
containing both the complete file from the repository & the
complete copy of the locally modified file one under the other.
When performing a merge with the same file under UNIX (using
plain cvs) only the small conflicting subsections of the file
are marked and given in duplicate. Any ideas what's going on
here or how to fix it? Is there some messing around with
end-of-line characters happening by the connection or something
like that? 

Any help appreciated (we would like to use jCVS because it looks
like a nice, user-friendly and portable product, however if we
can't do proper merges then it's not worth having :-(

Thanks in advance,

Andreas

-- 
+--------------------------------------------------------+
| A T Ernst, CSIRO Mathematical and Information Sciences |
| Private Bag 10, Clayton South MDC Vic 3169,  Australia |
| Email: Andreas.Ernst@cmis.csiro.au  Fax: (03) 95458080 |
| Web Page: http://www.cmis.csiro.au/Andreas.Ernst/      |
+--------------------------------------------------------+