Build 5321: CVS Merge doesn't work when there is a conflict Permanently deleted user Created June 14, 2006 12:08 When using CVS merge and there is a conflict during the merging, the conflict merging window will popup but it will show no differences