fix: another way to fix \r shouldn't be visualized like a newline in Combined renderer

Signed-off-by: Jack Cherng <jfcherng@gmail.com>

Author: jfcherng

example/diff-table.css

@@ -90,9 +90,6 @@
   background-size: calc(var(--tab-size) * 1ch) 1.25em;
   background-position: 2px center;
 }
-.diff-wrapper.diff.diff-html.diff-combined .change.change-rep .rep {
-  white-space: normal;
-}
 .diff-wrapper.diff.diff-html .change.change-eq .old,
 .diff-wrapper.diff.diff-html .change.change-eq .new {
   background: #fff;

example/diff-table.scss

@@ -146,15 +146,6 @@ $img-tab: 'data:image/svg+xml,%3Csvg preserveAspectRatio="xMinYMid meet" viewBox
       }
     }
 
-    &.diff-combined {
-      .change.change-rep {
-        .rep {
-          // fixes https://github.com/jfcherng/php-diff/issues/34#issuecomment-671404456
-          white-space: normal;
-        }
-      }
-    }
-
     .change {
       &.change-eq {
         .old,

src/Renderer/Html/Combined.php

@@ -512,6 +512,8 @@ protected function customFormatLines(array $lines, int $op): array
             if ($htmlClosures) {
                 $line = str_replace(RendererConstant::HTML_CLOSURES, $htmlClosures, $line);
             }
+            // fixes https://github.com/jfcherng/php-diff/issues/34
+            $line = str_replace("\r\n", "\n", $line);
         }
 
         return $lines;