l10n: fr v2.24.0 rnd2

[thirdparty/git.git] / diffcore-break.c

diff --git a/diffcore-break.c b/diffcore-break.c
index 875aefd3febf46771cc56c1f2b9f26318cfc732b..9d20a6a6fc1d8abe1cb4a75afea6c38ea01c6d3c 100644 (file)
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -286,17 +286,17 @@ void diffcore_merge_broken(void)
                                        /* Peer survived.  Merge them */
                                        merge_broken(p, pp, &outq);
                                        q->queue[j] = NULL;
-                                       break;
+                                       goto next;
                                }
                        }
-                       if (q->nr <= j)
-                               /* The peer did not survive, so we keep
-                                * it in the output.
-                                */
-                               diff_q(&outq, p);
+                       /* The peer did not survive, so we keep
+                        * it in the output.
+                        */
+                       diff_q(&outq, p);
                }
                else
                        diff_q(&outq, p);
+next:;
        }
        free(q->queue);
        *q = outq;