Skip to content
Snippets Groups Projects
Commit f17d2e8c authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Forgot to remove debug loop limit in diff3.

Rev: lib/modules/Array.pmod:1.26
parent fc84cc50
No related branches found
No related tags found
No related merge requests found
......@@ -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.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment