mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'fc/rerere-conflict-style'
* fc/rerere-conflict-style: rerere: fix for merge.conflictstyle
This commit is contained in:
commit
6d3c4e93d4
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue