It would be nice if IDEA recognized CVS merge conflict marks as such. It could do something fancy or simply not attempt to parse them as Java code....
--
fedor.
----
"Here's something to think about: How come you never see a headline like
`Psychic Wins Lottery'?"
-- Jay Leno
_______________________________________________
Eap-features mailing list
[EMAIL PROTECTED]
http://www.intellij.com/mailman/listinfo/eap-features
