diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-03 12:06:45 -0700 |
| commit | 6d3c4e93d40c3a7fce3c8bdc933feeb74a6b2b08 (patch) | |
| tree | bc3d2b2c238b57f89df7b8483e9fa5e369513a8e | |
| parent | 520cd9cd20a97d1220d6f0ebf921406683ad62ee (diff) | |
| parent | de3d8bb7736cafae0ff10e047e2afa994b1dd901 (diff) | |
| download | git-6d3c4e93d40c3a7fce3c8bdc933feeb74a6b2b08.tar.gz | |
Merge branch 'fc/rerere-conflict-style'
* fc/rerere-conflict-style:
rerere: fix for merge.conflictstyle
| -rw-r--r-- | builtin/rerere.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) |