===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff3/diff3prog.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/diff3/diff3prog.c	2003/10/24 20:32:06	1.3
--- src/usr.bin/diff3/diff3prog.c	2003/11/09 20:13:57	1.4
***************
*** 1,4 ****
! /*	$OpenBSD: diff3prog.c,v 1.3 2003/10/24 20:32:06 avsm Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3prog.c,v 1.4 2003/11/09 20:13:57 otto Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 71,77 ****
  #endif /* not lint */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diff3prog.c,v 1.3 2003/10/24 20:32:06 avsm Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
--- 71,77 ----
  #endif /* not lint */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diff3prog.c,v 1.4 2003/11/09 20:13:57 otto Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
***************
*** 200,206 ****
  }
  
  /*
!  * Pick up the line numbers of allcahnges from one change file.
   * (This puts the numbers in a vector, which is not strictly necessary,
   * since the vector is processed in one sequential pass.
   * The vector could be optimized out of existence)
--- 200,206 ----
  }
  
  /*
!  * Pick up the line numbers of all changes from one change file.
   * (This puts the numbers in a vector, which is not strictly necessary,
   * since the vector is processed in one sequential pass.
   * The vector could be optimized out of existence)
***************
*** 346,352 ****
  			dup = duplicate(&d1->old,&d2->old);
  			/*
  			 * dup = 0 means all files differ
! 			 * dup = 1 meands files 1 and 2 identical
  			 */
  			if (eflag==0) {
  				separate(dup ? "3" : "");
--- 346,352 ----
  			dup = duplicate(&d1->old,&d2->old);
  			/*
  			 * dup = 0 means all files differ
! 			 * dup = 1 means files 1 and 2 identical
  			 */
  			if (eflag==0) {
  				separate(dup ? "3" : "");
***************
*** 441,447 ****
  }
  
  /*
!  * skip to just befor line number from in file "i".  If "pr" is non-NULL,
   * print all skipped stuff with string pr as a prefix.
   */
  int
--- 441,447 ----
  }
  
  /*
!  * skip to just before line number from in file "i".  If "pr" is non-NULL,
   * print all skipped stuff with string pr as a prefix.
   */
  int