sequencer: rename reset_for_rollback to reset_merge

diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index 784bd193219e46dff7a9773614036344b23f7039..9202e75544761f274d3e360a3dc609fff294d0bb 100644 (file)
--- a/builtin/range-diff.c
+++ b/builtin/range-diff.c
@@ -32,7 +32,7 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
        repo_diff_setup(the_repository, &diffopt);
 
        options = parse_options_concat(range_diff_options, diffopt.parseopts);
-       argc = parse_options(argc, argv, NULL, options,
+       argc = parse_options(argc, argv, prefix, options,
                             builtin_range_diff_usage, 0);
 
        diff_setup_done(&diffopt);