Merge branch 'jk/fsck-exit-code-fix'

diff --git a/builtin/notes.c b/builtin/notes.c
index c25a4125103b5bb1c8571864a974105decc1a181..67d0bb14f8f18003d6a073b0c264f5b46ca12685 100644 (file)
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -210,7 +210,7 @@ static void create_note(const unsigned char *object, struct msg_arg *msg,
                if (write_sha1_file(msg->buf.buf, msg->buf.len, blob_type, result)) {
                        error(_("unable to write note object"));
                        if (path)
-                               error(_("The note contents has been left in %s"),
+                               error(_("The note contents have been left in %s"),
                                      path);
                        exit(128);
                }