Merge branch 'js/replace-edit-use-editor-configuration' into maint

diff --git a/builtin/checkout.c b/builtin/checkout.c
index cfa66e25eb0838ba70d87d3008c6d3c57e363bd1..efcbd8f6b5e0b7d551c88c02b6d7d3069a47944d 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -662,7 +662,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
                }
        } else if (new->path) { /* Switch branches. */
                if (create_symref("HEAD", new->path, msg.buf) < 0)
-                       die("unable to update HEAD");
+                       die(_("unable to update HEAD"));
                if (!opts->quiet) {
                        if (old->path && !strcmp(new->path, old->path)) {
                                if (opts->new_branch_force)