===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/rcs.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -c -r1.62 -r1.63
*** src/usr.bin/cvs/rcs.h	2006/05/27 03:30:31	1.62
--- src/usr.bin/cvs/rcs.h	2006/05/28 01:24:28	1.63
***************
*** 1,4 ****
! /*	$OpenBSD: rcs.h,v 1.62 2006/05/27 03:30:31 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcs.h,v 1.63 2006/05/28 01:24:28 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 40,45 ****
--- 40,48 ----
  #define RCS_HEAD_INIT		"1.1"
  #define RCS_HEAD_REV		((RCSNUM *)(-1))
  
+ #define RCS_CONFLICT_MARKER1	"<<<<<<< "
+ #define RCS_CONFLICT_MARKER2	">>>>>>> "
+ #define RCS_CONFLICT_MARKER3	"=======\n"
  
  #define RCS_SYM_INVALCHAR	"$,.:;@"