===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/cvs.h,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- src/usr.bin/cvs/cvs.h	2006/05/30 06:34:39	1.110
+++ src/usr.bin/cvs/cvs.h	2006/06/03 19:07:13	1.111
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cvs.h,v 1.110 2006/05/30 06:34:39 joris Exp $	*/
+/*	$OpenBSD: cvs.h,v 1.111 2006/06/03 19:07:13 joris Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -352,5 +352,6 @@
 int	update_has_conflict_markers(struct cvs_file *);
 
 #define CO_MERGE	0x01
+#define CO_SETSTICKY	0x02
 
 #endif