Stefan Sperling:

> Thanks! Below patch makes your test pass. ok? 

What is the goal of treating \r\n as special here?

Couldn't we just drop the special handling and treat \r as an
ordinary character?

--- 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++) {

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de