[PATCH] rerere: fix for merge.conflictstyle
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Apr 30, 2014, 04:08 UTC
- Message-ID
- <1398830909-24680-1-git-send-email-felipe.contreras@gmail.com>
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.
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> --- builtin/rerere.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/builtin/rerere.c b/builtin/rerere.c index 4e51add..98eb8c5 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)
-- 1.9.2+fc1.10.gc7d6c45.dirty