зеркало из https://github.com/microsoft/git.git
merge-recursive: use DIFF_XDL_SET macro
Instead of implementing this on our own, just use a convenience macro. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
8c8e978f57
Коммит
c2d4b4cd06
|
@ -2209,11 +2209,11 @@ int parse_merge_opt(struct merge_options *o, const char *s)
|
|||
o->xdl_opts |= value;
|
||||
}
|
||||
else if (!strcmp(s, "ignore-space-change"))
|
||||
o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
|
||||
DIFF_XDL_SET(o, IGNORE_WHITESPACE_CHANGE);
|
||||
else if (!strcmp(s, "ignore-all-space"))
|
||||
o->xdl_opts |= XDF_IGNORE_WHITESPACE;
|
||||
DIFF_XDL_SET(o, IGNORE_WHITESPACE);
|
||||
else if (!strcmp(s, "ignore-space-at-eol"))
|
||||
o->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
|
||||
DIFF_XDL_SET(o, IGNORE_WHITESPACE_AT_EOL);
|
||||
else if (!strcmp(s, "renormalize"))
|
||||
o->renormalize = 1;
|
||||
else if (!strcmp(s, "no-renormalize"))
|
||||
|
|
Загрузка…
Ссылка в новой задаче