Build 5321: CVS Merge doesn't work when there is a conflict

When using CVS merge and there is a conflict during the merging, the conflict
merging window will popup but it will show no differences


1 comment
Comment actions Permalink

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!"

When using CVS merge and there is a conflict during the merging, the
conflict merging window will popup but it will show no differences



0

Please sign in to leave a comment.