pack-redundant: consistent sort method

diff --git a/builtin/merge.c b/builtin/merge.c
index 42e227e11c7ebcbaa601b665b6074f655cdf2e48..dc0b7cc521c26f4c0ef1c6440d17c0f35ac1c983 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -897,7 +897,7 @@ static int suggest_conflicts(void)
        filename = git_path_merge_msg(the_repository);
        fp = xfopen(filename, "a");
 
-       append_conflicts_hint(&msgbuf);
+       append_conflicts_hint(&the_index, &msgbuf);
        fputs(msgbuf.buf, fp);
        strbuf_release(&msgbuf);
        fclose(fp);