I don't understand why a conflict was returned on a keyword when you used
-kk ?
Andy
-----Original Message-----
From: Venessa Williams [mailto:[EMAIL PROTECTED]]
/*
<<<<<< a.java
* $Header: a.java,v 1.11 2001/04/30 21:31:33 user1 Exp
$
=========
* $Header: a.java,v 1.9.2.1 2001/06/15 16:45:05 user2
Exp $
>>>>>>>>1.9.2.1
*/
cvs update -kk -j tag1 -j tag2 -Pd
NOTICE AND DISCLAIMER:
This email (including attachments) is confidential. If you have received
this email in error please notify the sender immediately and delete this
email from your system without copying or disseminating it or placing any
reliance upon its contents. We cannot accept liability for any breaches of
confidence arising through use of email. Any opinions expressed in this
email (including attachments) are those of the author and do not necessarily
reflect our opinions. We will not accept responsibility for any commitments
made by our employees outside the scope of our business. We do not warrant
the accuracy or completeness of such information.
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
