Hi, I'm currently running CVS 1.10.4 on Solaris. I have a issue with merge in which the only conflict is the CVS revision. Is there any switch to tell CVS to ignore diff in revs? Oftentimes, both files on the branch and the HEAD are already in sync, however, only their CVS revisions are different, e.g.
<<<<<<< foobar.c * $Revision: 1.1.12.5 $ $Date: 2005/05/13 00:51:04 $ ======= * $Revision: 1.4 $ $Date: 2005/05/12 23:12:08 $ >>>>>>> 1.4 I appreciate your help. Thanks, Dean _______________________________________________ Info-cvs mailing list [email protected] http://lists.gnu.org/mailman/listinfo/info-cvs
