rerere: use "struct rerere_id" instead of "char *" for conflict ID

diff --git a/builtin/rerere.c b/builtin/rerere.c
index 81730bb5e677cbb1c622984d8b518ca4b6bfa611..fd229a7c7dae54be4285ba4d9528fb4d1aae2b74 100644 (file)
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -103,7 +103,7 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
        } else if (!strcmp(argv[0], "diff"))
                for (i = 0; i < merge_rr.nr; i++) {
                        const char *path = merge_rr.items[i].string;
-                       const char *id = (const char *)merge_rr.items[i].util;
+                       const struct rerere_id *id = merge_rr.items[i].util;
                        diff_two(rerere_path(id, "preimage"), path, path, path);
                }
        else