Merge branch 'fc/rerere-conflict-style'

* fc/rerere-conflict-style: rerere: fix for merge.conflictstyle
2014-06-03 12:06:45 -07:00 · 2014-06-03 12:06:45 -07:00 · 6d3c4e93d4
parent 520cd9cd20 de3d8bb773
commit 6d3c4e93d4
1 changed files with 2 additions and 0 deletions
--- 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)