aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--read-tree.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/read-tree.c b/read-tree.c
index 0d94fe214..0d5ded502 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -543,6 +543,7 @@ int main(int argc, char **argv)
merge = 1;
stage = 1;
read_cache_unmerged();
+ continue;
}
/* "-m" stands for "merge", meaning we start in stage 1 */