===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/cvs/diff.h	2005/10/26 18:13:58	1.6
--- src/usr.bin/cvs/diff.h	2005/11/21 15:01:10	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: diff.h,v 1.6 2005/10/26 18:13:58 xsa Exp $	*/
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: diff.h,v 1.7 2005/11/21 15:01:10 xsa Exp $	*/
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
   * All rights reserved.
***************
*** 102,110 ****
  int		cvs_diffreg(const char *, const char *, BUF *out);
  int		ed_patch_lines(struct cvs_lines *, struct cvs_lines *);
  
! extern int      diff_format;
! extern int	diff3_conflicts;
  extern char	*diff_file;
  extern BUF	*diffbuf;
  
  #endif
--- 102,111 ----
  int		cvs_diffreg(const char *, const char *, BUF *out);
  int		ed_patch_lines(struct cvs_lines *, struct cvs_lines *);
  
! extern int       diff_format;
! extern int	 diff3_conflicts;
  extern char	*diff_file;
+ extern char	 diffargs[128];
  extern BUF	*diffbuf;
  
  #endif