summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-07-06 18:14:45 -0700
committerJunio C Hamano <gitster@pobox.com>2017-07-06 18:14:45 -0700
commit2f4bcd8b70041627abdf7811acb67cc8e7bee574 (patch)
tree80bd799401fe27f0f65f9d1babbad11dbd63fe18
parentf9b3252b2a4b3dbaa9f8434cdd2b8fd3013519f1 (diff)
parentc2d4b4cd06f19e89ad242c2de542821edc01c01f (diff)
downloadgit-2f4bcd8b70041627abdf7811acb67cc8e7bee574.tar.gz
Merge branch 'sb/merge-recursive-code-cleanup'
Code clean-up. * sb/merge-recursive-code-cleanup: merge-recursive: use DIFF_XDL_SET macro
-rw-r--r--merge-recursive.c6
1 files 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"))