Commit df3acff
authored
fix: extra empty lines in diff (Windows) (#2015)
When using CR/LF as newline on Windows, there were extra empty lines
shown in diffs.
Commit b84b79 fixed a regression (#1996) by keeping CRs as content of
diff lines instead of removing them. Additionally since commit 796f88
(#1543) the output for diffs uses the default newline depending on
platform, that's CR/LF on Windows.
As consequence on Windows with files containing CR/LF as newlines the
content (ending in CR) and the default newline CR/LF resulted in CR CR
LF, which is interpreted as two line breaks instead of one.
So b84b79 introduced itself a regression that's fixed in this commit by
partially reverting commit 796f88.
This fixes #2001.1 parent 283f84f commit df3acff
1 file changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
931 | 931 | | |
932 | 932 | | |
933 | 933 | | |
934 | | - | |
| 934 | + | |
935 | 935 | | |
936 | 936 | | |
937 | 937 | | |
| |||
1121 | 1121 | | |
1122 | 1122 | | |
1123 | 1123 | | |
1124 | | - | |
| 1124 | + | |
1125 | 1125 | | |
1126 | 1126 | | |
1127 | 1127 | | |
| |||
0 commit comments