Today seems to be the day of bugs for me :o) Anyway, I'm using WinCVS and IDEA. Suppose I'm modifying class A, now I checkout latest version from cvs and AFAICS if there's a conflict the area after the ======= sign adds empty line for each line so:
/* * Change log * */ Becomes: /* * Change log * */ !!! And the empty lines seem to be ^M character or something like that. Is it an IDEA bug? Anyone else encountering it? Cheers, Ara. _________________________________________________________ Do You Yahoo!? Get your free @yahoo.com address at http://mail.yahoo.com _______________________________________________ Eap-list mailing list [EMAIL PROTECTED] http://www.intellij.com/mailman/listinfo/eap-list
