commit 1dc869217ab6349432babacb4dc18ac039b76e25
from: Christian Weisgerber <naddy@mips.inka.de>
via: Thomas Adam <thomas@xteddy.org>
date: Sun May 14 11:47:50 2023 UTC

sync files from diff.git f46fa9b5e78156c0360f508336dbe3dfa04b503f

Do not treat \r\n line endings as special.

commit - 1faec3fb1acea5d3cb89b1e0ae2eeddb84cda4b9
commit + 1dc869217ab6349432babacb4dc18ac039b76e25
blob - 8b2477047aa2fbba35eb20ce030a857b1d0c4664
blob + f44e799638f771a0588c11e3d5b6b1200b5c64f1
--- lib/diff_output.c
+++ lib/diff_output.c
@@ -90,13 +90,6 @@ diff_output_lines(struct diff_output_info *outinfo, FI
 				return rc;
 			if (ch == '\n')
 				len--;
-			if (len) {
-				rc = get_atom_byte(&ch, atom, len - 1);
-				if (rc)
-					return rc;
-				if (ch == '\r')
-					len--;
-			}
 		}
 
 		for (i = 0; i < len; i++) {