From de3d8bb7736cafae0ff10e047e2afa994b1dd901 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Tue, 29 Apr 2014 23:08:29 -0500 Subject: 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 Reviewed-by: Jeff King Signed-off-by: Junio C Hamano --- builtin/rerere.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'builtin/rerere.c') diff --git a/builtin/rerere.c b/builtin/rerere.c index 4e51addb3..98eb8c540 100644 --- 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) -- cgit v1.2.1