diff options
| -rw-r--r-- | xdiff-interface.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c index e8ef46d10d..d782f06d99 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -254,16 +254,6 @@ static long ff_regexp(const char *line, long len, line_buffer = xstrndup(line, len); /* make NUL terminated */ - /* Exclude terminating newline (and cr) from matching */ - if (len > 0 && line[len-1] == '\n') { - if (len > 1 && line[len-2] == '\r') - len -= 2; - else - len--; - } - - line_buffer = xstrndup(line, len); /* make NUL terminated */ - for (i = 0; i < regs->nr; i++) { struct ff_reg *reg = regs->array + i; if (!regexec(®->re, line_buffer, 2, pmatch, 0)) { @@ -338,4 +328,3 @@ int git_xmerge_config(const char *var, const char *value, void *cb) } return git_default_config(var, value, cb); } - |