From f17d2e8c524c5adaf773da792bc1c95fd798fbc6 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@lysator.liu.se>
Date: Fri, 4 Dec 1998 14:34:00 +0100
Subject: [PATCH] Forgot to remove debug loop limit in diff3.
Rev: lib/modules/Array.pmod:1.26
---
lib/modules/Array.pmod | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/modules/Array.pmod b/lib/modules/Array.pmod
index 5f69de19f7..b49bd0e0dc 100644
--- a/lib/modules/Array.pmod
+++ b/lib/modules/Array.pmod
@@ -260,8 +260,7 @@ array(array(array)) diff3 (array a, array b, array c)
int ai = 0, bi = 0, ci = 0;
int prevodd = -2;
- int i = 10;
- while (i-- && !(aeq[ai] & beq[bi] & ceq[ci] & 4)) {
+ while (!(aeq[ai] & beq[bi] & ceq[ci] & 4)) {
array empty = ({}), apart = empty, bpart = empty, cpart = empty;
if (aeq[ai] == 2 && beq[bi] == 1) { // a and b are equal.
--
GitLab