CVS merge when there is a conflict is still broken

CVS conflict merge is still broken. All 3 windows will show up with the exact same code. Therefore, I can't merge anything.

Please sign in to leave a comment.