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

diff --git a/builtin/tag.c b/builtin/tag.c
index b577af562a4a554f43c64256e112fcbc423edd3d..ea55f1d1bdd524abd46e6baa7a02ef85d56d5eb2 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -574,7 +574,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
        if (annotate)
                create_tag(object, tag, &buf, &opt, prev, object);
 
-       lock = lock_any_ref_for_update(ref.buf, prev, 0);
+       lock = lock_any_ref_for_update(ref.buf, prev, 0, NULL);
        if (!lock)
                die(_("%s: cannot lock the ref"), ref.buf);
        if (write_ref_sha1(lock, object, NULL) < 0)