development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 08:39:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sb/merge-recursive-code-cleanup' into maint

Browse source 
Code clean-up.

* sb/merge-recursive-code-cleanup:
  merge-recursive: use DIFF_XDL_SET macro
This commit is contained in:
Junio C Hamano 2017-07-10 13:59:09 -07:00
parent 127c13aa41 c2d4b4cd06
commit 4aaf5b0b21
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
merge-recursive.c
View file

@ -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"))