===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff3/diff3prog.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/diff3/diff3prog.c	2015/10/09 01:37:07	1.17
--- src/usr.bin/diff3/diff3prog.c	2016/10/16 13:03:40	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: diff3prog.c,v 1.17 2015/10/09 01:37:07 deraadt Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3prog.c,v 1.18 2016/10/16 13:03:40 millert Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 543,549 ****
  	int j,k;
  	char block[BUFSIZ];
  
! 	for (n = n; n > 0; n--) {
  		if (!oflag || !overlap[n])
  			prange(&de[n].old);
  		else
--- 543,549 ----
  	int j,k;
  	char block[BUFSIZ];
  
! 	for (; n > 0; n--) {
  		if (!oflag || !overlap[n])
  			prange(&de[n].old);
  		else