Merge branch 'jc/ignore-cr-at-eol'
[gitweb.git] / merge-recursive.c
index b48b15a6fd88a89c03b259ebc3efed361c7f4d4a..85b4e58478fad71ca754673777dc255922773b7f 100644 (file)
@@ -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"))