CVS can't recognize identical changes when merging

[Stephen Rasku]

Found on CVS 1.10.8

If make a branch tag on a file and then make the identical change on 
the branch and on the trunk and then try to merge from the branch to 
the trunk you will get conflicts.  CVS should recognize that the 
conflicts are identical and just keep one copy.



_______________________________________________
Bug-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/bug-cvs