diff options
| author | Tom Jones <thj@FreeBSD.org> | 2022-05-25 13:41:43 +0000 |
|---|---|---|
| committer | Tom Jones <thj@FreeBSD.org> | 2022-05-25 13:43:14 +0000 |
| commit | 7d975c7f93f16209f0e6417ebd178d8538eb0633 (patch) | |
| tree | 270d530713b9693e704f50774e377b98c3007e52 /usr.bin/diff3/diff3.c | |
| parent | e605b87a9e75a7f693527f0aad8189ae9db20f16 (diff) | |
Diffstat (limited to 'usr.bin/diff3/diff3.c')
| -rw-r--r-- | usr.bin/diff3/diff3.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |