From c2d4b4cd06f19e89ad242c2de542821edc01c01f Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Thu, 29 Jun 2017 15:19:32 -0700 Subject: merge-recursive: use DIFF_XDL_SET macro Instead of implementing this on our own, just use a convenience macro. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- merge-recursive.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 62decd51cc..7a7d55aabe 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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")) -- cgit v1.2.1