From 808e202125b009c0b61a2f02e3aeff9e1102e6a3 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 24 Mar 1994 22:54:32 +0000 Subject: [PATCH] entered into RCS --- src/conflicts.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conflicts.c b/src/conflicts.c index 03dc1cf9..a054dbd0 100644 --- a/src/conflicts.c +++ b/src/conflicts.c @@ -742,9 +742,9 @@ int state; if (mask == 0) { mask = 1; - /* This used to be fp1, but I think fp2 is right - because fp2 is where the words are fetched to test with mask - in this loop. */ + /* We tried incrementing just fp1, and just fp2; both seem wrong. + It seems necessary to increment both in sync. */ + fp1++; fp2++; } } -- 2.45.2