diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-27 05:06:31 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-27 05:06:31 +0300 |
| commit | 10f65c239a885336b745cc9d2e1654980ffef41e (patch) | |
| tree | f10ffd064f85e27f3ff8b64e0d26e179df8bca77 /merge-recursive.c | |
| parent | 14c63a9dc093d6738454f6369a4f5663ca732cf7 (diff) | |
| parent | e9282f02b2f21118f3383608718e38efc3d967e1 (diff) | |
Merge branch 'jc/ignore-cr-at-eol'
The "diff" family of commands learned to ignore differences in
carriage return at the end of line.
* jc/ignore-cr-at-eol:
diff: --ignore-cr-at-eol
xdiff: reassign xpparm_t.flags bits
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index b48b15a6fd..85b4e58478 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2252,6 +2252,8 @@ int parse_merge_opt(struct merge_options *o, const char *s) DIFF_XDL_SET(o, IGNORE_WHITESPACE); else if (!strcmp(s, "ignore-space-at-eol")) DIFF_XDL_SET(o, IGNORE_WHITESPACE_AT_EOL); + else if (!strcmp(s, "ignore-cr-at-eol")) + DIFF_XDL_SET(o, IGNORE_CR_AT_EOL); else if (!strcmp(s, "renormalize")) o->renormalize = 1; else if (!strcmp(s, "no-renormalize")) |