t4200: rerere a merge with two identical conflicts

diff --git a/builtin/rerere.c b/builtin/rerere.c
index 4e51addb3e135465bdb728bb00c5dc3dd53b7c51..fd229a7c7dae54be4285ba4d9528fb4d1aae2b74 100644 (file)
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -60,6 +60,8 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
 
        argc = parse_options(argc, argv, prefix, options, rerere_usage, 0);
 
+       git_config(git_xmerge_config, NULL);
+
        if (autoupdate == 1)
                flags = RERERE_AUTOUPDATE;
        if (autoupdate == 0)
@@ -101,8 +103,8 @@ 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 *name = (const char *)merge_rr.items[i].util;
-                       diff_two(rerere_path(name, "preimage"), path, path, path);
+                       const struct rerere_id *id = merge_rr.items[i].util;
+                       diff_two(rerere_path(id, "preimage"), path, path, path);
                }
        else
                usage_with_options(rerere_usage, options);