===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsmerge.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/rcs/rcsmerge.c	2005/10/23 11:04:26	1.4
--- src/usr.bin/rcs/rcsmerge.c	2005/10/23 11:42:43	1.5
***************
*** 1,4 ****
! /*	$OpenBSD: rcsmerge.c,v 1.4 2005/10/23 11:04:26 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsmerge.c,v 1.5 2005/10/23 11:42:43 niallo Exp $	*/
  /*
   * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
   * All rights reserved.
***************
*** 37,42 ****
--- 37,43 ----
  #include "diff.h"
  #include "rcsprog.h"
  
+ extern diff3_conflicts;
  
  static int kflag = RCS_KWEXP_ERR;