===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff3/diff3prog.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- src/usr.bin/diff3/diff3prog.c	2014/12/01 06:36:32	1.14
+++ src/usr.bin/diff3/diff3prog.c	2015/09/05 09:47:08	1.15
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff3prog.c,v 1.14 2014/12/01 06:36:32 deraadt Exp $	*/
+/*	$OpenBSD: diff3prog.c,v 1.15 2015/09/05 09:47:08 jsg Exp $	*/
 
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
@@ -298,7 +298,7 @@
 	d1 = d13;
 	d2 = d23;
 	j = 0;
-	while ((t1 = d1 < d13 + m1) | (t2 = d2 < d23 + m2)) {
+	while ((t1 = (d1 < d13 + m1)) | (t2 = (d2 < d23 + m2))) {
 		if (debug) {
 			printf("%d,%d=%d,%d %d,%d=%d,%d\n",
 			d1->old.from,d1->old.to,