diff options
| author | Stefan Beller <sbeller@google.com> | 2017-06-29 15:19:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-30 10:56:37 -0700 |
| commit | c2d4b4cd06f19e89ad242c2de542821edc01c01f (patch) | |
| tree | af3b299b8d8cc7f8ca34b471c9e7823c7e795b55 | |
| parent | 8c8e978f5719c6a58fb998742207bf907f963143 (diff) | |
| download | git-c2d4b4cd06f19e89ad242c2de542821edc01c01f.tar.gz git-c2d4b4cd06f19e89ad242c2de542821edc01c01f.tar.xz | |
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>
| -rw-r--r-- | merge-recursive.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 62decd51c..7a7d55aab 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")) |