summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ce30a4b)
raw | patch | inline | side by side (parent: ce30a4b)
author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Wed, 15 Jun 2005 17:25:46 +0000 (10:25 -0700) | ||
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Wed, 15 Jun 2005 17:25:46 +0000 (10:25 -0700) |
read-tree.c | patch | blob | history |
diff --git a/read-tree.c b/read-tree.c
index 0d94fe214d4fd7b24b00f419097f79dab4889670..0d5ded5026c0a87987938c498e271c1d8cce122c 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
merge = 1;
stage = 1;
read_cache_unmerged();
+ continue;
}
/* "-m" stands for "merge", meaning we start in stage 1 */