diff options
Diffstat (limited to 'git-rediff.c')
| -rw-r--r-- | git-rediff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rediff.c b/git-rediff.c index f1b277b..7e0727b 100644 --- a/git-rediff.c +++ b/git-rediff.c @@ -113,7 +113,7 @@ line_is_marker(struct line *line, char marker_symbol, size_t conflict_marker_siz if (line->text[i] != marker_symbol) return 0; - return i == line->len || line->text[i] == ' ' || line->text[i] == '\n'; + return i == line->len || line->text[i] == ' ' || line->text[i] == '\n' || line->text[i] == '\r'; } static void |