rerere: fix for merge.conflictstyle
If we use a different conflict style `git rerere forget` is not able to find the matching conflict SHA-1 because the diff generated is actually different from what `git merge` generated, due to the XDL_MERGE_* option differences among the codepaths. The fix is to call git_xmerge_config() so that git_xmerge_style is set properly and the diffs match. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
Apr 29, 2014 at 23:08 UTC
de3d8bb7736cafae0ff10e047e2afa994b1dd901
1 file changed
+2
builtin/rerere.c
+2
@@ -60,6 +60,8 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
60
61
argc = parse_options(argc, argv, prefix, options, rerere_usage, 0);
62
63
+ git_config(git_xmerge_config, NULL);
64
+
65
if (autoupdate == 1)
66
flags = RERERE_AUTOUPDATE;
67
if (autoupdate == 0)