From: Felipe Contreras Date: Wed, 30 Apr 2014 04:08:29 +0000 (-0500) Subject: rerere: fix for merge.conflictstyle X-Git-Tag: v2.0.1~8^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/de3d8bb7736cafae0ff10e047e2afa994b1dd901?ds=inline;hp=--cc 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 --- de3d8bb7736cafae0ff10e047e2afa994b1dd901 diff --git a/builtin/rerere.c b/builtin/rerere.c index 4e51addb3e..98eb8c5404 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)