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>
Stefan Beller committed
Jun 29, 2017 at 15:19 UTC
c2d4b4cd06f19e89ad242c2de542821edc01c01f
1 file changed
+3
-3
merge-recursive.c
+3
-3
@@ -2209,11 +2209,11 @@ int parse_merge_opt(struct merge_options *o, const char *s)
2209
o->xdl_opts |= value;
2210
}
2211
else if (!strcmp(s, "ignore-space-change"))
2212
- o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
2212
+ DIFF_XDL_SET(o, IGNORE_WHITESPACE_CHANGE);
2213
else if (!strcmp(s, "ignore-all-space"))
2214
- o->xdl_opts |= XDF_IGNORE_WHITESPACE;
2214
+ DIFF_XDL_SET(o, IGNORE_WHITESPACE);
2215
else if (!strcmp(s, "ignore-space-at-eol"))
2216
- o->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
2216
+ DIFF_XDL_SET(o, IGNORE_WHITESPACE_AT_EOL);
2217
else if (!strcmp(s, "renormalize"))
2218
o->renormalize = 1;
2219
else if (!strcmp(s, "no-renormalize"))