===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff3/diff3prog.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/diff3/diff3prog.c	2003/11/09 20:13:57	1.4
--- src/usr.bin/diff3/diff3prog.c	2004/01/07 18:16:42	1.5
***************
*** 1,4 ****
! /*	$OpenBSD: diff3prog.c,v 1.4 2003/11/09 20:13:57 otto Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3prog.c,v 1.5 2004/01/07 18:16:42 canacar Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 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>
--- 71,77 ----
  #endif /* not lint */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diff3prog.c,v 1.5 2004/01/07 18:16:42 canacar Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
***************
*** 301,307 ****
  			d2->new.from,d2->new.to);
  		}
  		/* first file is different from others */
! 		if ((!t2 || t1) && d1->new.to < d2->new.from) {
  			/* stuff peculiar to 1st file */
  			if (eflag==0) {
  				separate("1");
--- 301,307 ----
  			d2->new.from,d2->new.to);
  		}
  		/* first file is different from others */
! 		if (!t2 || (t1 && d1->new.to < d2->new.from)) {
  			/* stuff peculiar to 1st file */
  			if (eflag==0) {
  				separate("1");
***************
*** 313,319 ****
  			continue;
  		}
  		/* second file is different from others */
! 		if ((!t1 || t2) && d2->new.to < d1->new.from) {
  			if (eflag==0) {
  				separate("2");
  				keep(1, &d2->new);
--- 313,319 ----
  			continue;
  		}
  		/* second file is different from others */
! 		if (!t1 || (t2 && d2->new.to < d1->new.from)) {
  			if (eflag==0) {
  				separate("2");
  				keep(1, &d2->new);