===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/diff3.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -c -r1.1 -r1.2
*** src/usr.bin/rcs/diff3.c	2006/04/26 02:55:13	1.1
--- src/usr.bin/rcs/diff3.c	2006/04/27 07:59:33	1.2
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.1 2006/04/26 02:55:13 joris Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.2 2006/04/27 07:59:33 xsa Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 72,84 ****
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.1 2006/04/26 02:55:13 joris Exp $";
  #endif /* not lint */
  
  #include "includes.h"
  
  #include "diff.h"
! #include "util.h"
  #include "xmalloc.h"
  
  /* diff3 - 3-way differential file comparison */
--- 72,84 ----
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.2 2006/04/27 07:59:33 xsa Exp $";
  #endif /* not lint */
  
  #include "includes.h"
  
  #include "diff.h"
! #include "rcsutil.h"
  #include "xmalloc.h"
  
  /* diff3 - 3-way differential file comparison */