diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:59:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:59:09 -0700 |
| commit | 4aaf5b0b21ac1fc294066593ac5243b3eaff897b (patch) | |
| tree | 7285c1c971b3881c51e9cd05786bdae654342666 | |
| parent | 127c13aa41bdf3115561ae6e52313cfa278c35da (diff) | |
| parent | c2d4b4cd06f19e89ad242c2de542821edc01c01f (diff) | |
| download | git-4aaf5b0b21ac1fc294066593ac5243b3eaff897b.tar.gz | |
Merge branch 'sb/merge-recursive-code-cleanup' into maint
Code clean-up.
* sb/merge-recursive-code-cleanup:
merge-recursive: use DIFF_XDL_SET macro
| -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 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")) |