diff options
| author | Mattias Andrée <m@maandree.se> | 2024-11-27 23:06:04 +0100 |
|---|---|---|
| committer | Mattias Andrée <m@maandree.se> | 2024-11-27 23:06:04 +0100 |
| commit | 507ceb22e8f2b53d47a729cab1095f7d521e23c8 (patch) | |
| tree | 4d9ddc2d7d6ebde324c0ab6a7b1861c9d831a3f0 | |
| parent | Use git attributes to determine conflict marker size (diff) | |
| download | git-rediff-507ceb22e8f2b53d47a729cab1095f7d521e23c8.tar.gz git-rediff-507ceb22e8f2b53d47a729cab1095f7d521e23c8.tar.bz2 git-rediff-507ceb22e8f2b53d47a729cab1095f7d521e23c8.tar.xz | |
Fix support for CRLF line endings (which git may actually produce on conflict marker lines)HEAD1.0.4master
Signed-off-by: Mattias Andrée <m@maandree.se>
Diffstat (limited to '')
| -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 |