X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=read-tree.c;h=0d5ded5026c0a87987938c498e271c1d8cce122c;hb=b10d0ec7321a6bd6cc1a62f44fee305a0d184dca;hp=0d94fe214d4fd7b24b00f419097f79dab4889670;hpb=036d51cc557bcf919246ad30cb2ac7736bfc836b;p=git.git diff --git a/read-tree.c b/read-tree.c index 0d94fe21..0d5ded50 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 */