diff: don't split lines on bare CR as python splitlines do The line count from the @@ lines and the actual count would get out of sync and an incomplete diff would be shown. This is slower than native splitlines ... but that is what it takes to handle it correctly. (Except that we perhaps could use .split('\n') and patch the result ...)