merge: remove drop_save() in favor of remove_merge_branch_state()

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index c1cff3266114323f466133b98050f5aec71c5f91..e7325fe37f6148fd1ccd6fc5842bbc8f5022c306 100644 (file)
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -173,7 +173,7 @@ static int bisect_reset(const char *commit)
                        argv_array_clear(&argv);
                        return error(_("could not check out original"
                                       " HEAD '%s'. Try 'git bisect"
-                                      "reset <commit>'."), branch.buf);
+                                      " reset <commit>'."), branch.buf);
                }
                argv_array_clear(&argv);
        }
@@ -646,7 +646,7 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
                OPT_BOOL(0, "no-checkout", &no_checkout,
                         N_("update BISECT_HEAD instead of checking out the current commit")),
                OPT_BOOL(0, "no-log", &nolog,
-                        N_("no log for BISECT_WRITE ")),
+                        N_("no log for BISECT_WRITE")),
                OPT_END()
        };
        struct bisect_terms terms = { .term_good = NULL, .term_bad = NULL };