# [PATCH] merge-recursive: use DIFF_XDL_SET macro 2 messages from 2017-06-29 to 2017-06-30. Participants: Stefan Beller, Junio C Hamano. Thread: https://gitlist.dev/t/46288 ## Stefan Beller, 2017-06-29 22:19 Subject: [PATCH] merge-recursive: use DIFF_XDL_SET macro Message-ID: <20170629221932.3773-1-sbeller@google.com> URL: https://gitlist.dev/e/20170629221932.3773-1-sbeller%40google.com ``` Instead of implementing this on our own, just use a convenience macro. Signed-off-by: Stefan Beller --- merge-recursive.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 59e5ee41a8..1494ffdb82 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2210,11 +2210,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")) -- 2.13.0.31.g9b732c453e ``` ## Junio C Hamano, 2017-06-30 17:54 Subject: Re: [PATCH] merge-recursive: use DIFF_XDL_SET macro Message-ID: URL: https://gitlist.dev/e/xmqq8tk9s6n1.fsf%40gitster.mtv.corp.google.com In-Reply-To: <20170629221932.3773-1-sbeller@google.com> ``` Stefan Beller writes: > Instead of implementing this on our own, just use a convenience macro. > > Signed-off-by: Stefan Beller > --- Good eyes. Thanks. > merge-recursive.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/merge-recursive.c b/merge-recursive.c > index 59e5ee41a8..1494ffdb82 100644 > --- a/merge-recursive.c > +++ b/merge-recursive.c > @@ -2210,11 +2210,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")) ```