summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--diff-cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-cache.c b/diff-cache.c
index 2ec6c29..c7fa84b 100644
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -76,7 +76,7 @@ static void remove_merge_entries(void)
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i];
if (!ce_stage(ce))
- break;
+ continue;
printf("%s: unmerged\n", ce->name);
while (remove_entry_at(i)) {
if (!ce_stage(active_cache[i]))