git: 7d975c7f93f1 - main - diff3: Don't perform a bitwise OR when comparing diffs

The branch main has been updated by thj:

URL: https://cgit.FreeBSD.org/src/commit/?id=7d975c7f93f16209f0e6417ebd178d8538eb0633

commit 7d975c7f93f16209f0e6417ebd178d8538eb0633
Author:     Tom Jones <thj@FreeBSD.org>
AuthorDate: 2022-05-25 13:41:43 +0000
Commit:     Tom Jones <thj@FreeBSD.org>
CommitDate: 2022-05-25 13:43:14 +0000

    diff3: Don't perform a bitwise OR when comparing diffs
    
    This fixes the build now that it uses -Wbitwise-instead-of-logical
    
    Sponsored by:   Klara Inc.
---
 usr.bin/diff3/diff3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c
index 629e23288875..c7756f35bfe2 100644
--- a/usr.bin/diff3/diff3.c
+++ b/usr.bin/diff3/diff3.c
@@ -304,7 +304,7 @@ merge(int m1, int m2)
 	d2 = d23;
 	j = 0;
 
-	while ((t1 = d1 < d13 + m1) | (t2 = d2 < d23 + m2)) {
+	while (t1 = d1 < d13 + m1, t2 = d2 < d23 + m2, t1 || t2) {
 		/* first file is different from the others */
 		if (!t2 || (t1 && d1->new.to < d2->new.from)) {
 			/* stuff peculiar to 1st file */