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

diff --git a/builtin/reflog.c b/builtin/reflog.c
index ba27f7cc614214eb32f60b684b3617c39a0066ef..6eb24c8da27d265cad38628aeaa3e040dd298aab 100644 (file)
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -365,7 +365,7 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused,
         * we take the lock for the ref itself to prevent it from
         * getting updated.
         */
-       lock = lock_any_ref_for_update(ref, sha1, 0);
+       lock = lock_any_ref_for_update(ref, sha1, 0, NULL);
        if (!lock)
                return error("cannot lock ref '%s'", ref);
        log_file = git_pathdup("logs/%s", ref);