Build 5321: CVS Merge doesn't work when there is a conflict Permanently deleted user Created June 14, 2006 05:06 When using CVS merge and there is a conflict during the merging, the conflict merging window will popup but it will show no differences
Hello Nat,
are you sure you've directed this message to the correct newsgroup?
Regards,
Dmitry Shaporenkov
JetBrains, Inc
http://www.jetbrains.com
"Develop with pleasure!"