merge-recursive: handle addition of submodule on our side of history

diff --git a/sequencer.c b/sequencer.c
index 7886e2269eb7813cdf9f908002ec70a9561a153c..f2a10cc4f24c10adf072eb26ba427f00037b3c79 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -2558,7 +2558,7 @@ static enum check_level get_missing_commit_check_level(void)
                return CHECK_WARN;
        if (!strcasecmp("error", value))
                return CHECK_ERROR;
-       warning(_("unrecognized setting %s for option"
+       warning(_("unrecognized setting %s for option "
                  "rebase.missingCommitsCheck. Ignoring."), value);
        return CHECK_IGNORE;
 }
@@ -2948,9 +2948,9 @@ int rearrange_squash(void)
                if (fd < 0)
                        res = error_errno(_("could not open '%s'"), todo_file);
                else if (write(fd, buf.buf, buf.len) < 0)
-                       res = error_errno(_("could not read '%s'."), todo_file);
+                       res = error_errno(_("could not write to '%s'"), todo_file);
                else if (ftruncate(fd, buf.len) < 0)
-                       res = error_errno(_("could not finish '%s'"),
+                       res = error_errno(_("could not truncate '%s'"),
                                           todo_file);
                close(fd);
                strbuf_release(&buf);