merge & sequencer: turn "Conflicts:" hint into a comment

diff --git a/builtin/reset.c b/builtin/reset.c
index f2f9d55392d2193432d5a572a70cd27afcf6b136..60048030dd4d05e9938f298002d02afc31528bf1 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -304,7 +304,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
        if (patch_mode) {
                if (reset_type != NONE)
                        die(_("--patch is incompatible with --{hard,mixed,soft}"));
-               return run_add_interactive(sha1_to_hex(sha1), "--patch=reset", &pathspec);
+               return run_add_interactive(rev, "--patch=reset", &pathspec);
        }
 
        /* git reset tree [--] paths... can be used to