Index: src/checkin.c
==================================================================
--- src/checkin.c
+++ src/checkin.c
@@ -939,11 +939,11 @@
   if( fUnicode ){
     lookFlags = looks_like_utf16(p, bReverse, LOOK_NUL);
   }else{
     lookFlags = looks_like_utf8(p, LOOK_NUL);
   }
-  fHasAnyCr = (lookFlags & LOOK_CR);
+  fHasAnyCr = (lookFlags & LOOK_ANY_CR);
   fBinary = (lookFlags & LOOK_BINARY);
   fHasLoneCrOnly = ((lookFlags & LOOK_EOL) == LOOK_LONE_CR);
   fHasCrLfOnly = ((lookFlags & LOOK_EOL) == LOOK_CRLF);
   if( fUnicode || fHasAnyCr || fBinary ){
     const char *zWarning;

Index: src/diff.c
==================================================================
--- src/diff.c
+++ src/diff.c
@@ -70,21 +70,21 @@
 ** Output flags for the looks_like_utf8() and looks_like_utf16() routines used
 ** to convey status information about the blob content.
 */
 #define LOOK_NONE    ((int)0x00000000) /* Nothing special was found. */
 #define LOOK_NUL     ((int)0x00000001) /* One or more NUL chars were found. */
-#define LOOK_CR      ((int)0x00000002) /* One or more CR chars were found. */
 #define LOOK_LONE_CR ((int)0x00000004) /* An unpaired CR char was found. */
-#define LOOK_LF      ((int)0x00000008) /* One or more LF chars were found. */
 #define LOOK_LONE_LF ((int)0x00000010) /* An unpaired LF char was found. */
 #define LOOK_CRLF    ((int)0x00000020) /* One or more CR/LF pairs were found. */
 #define LOOK_LONG    ((int)0x00000040) /* An over length line was found. */
 #define LOOK_ODD     ((int)0x00000080) /* An odd number of bytes was found. */
 #define LOOK_SHORT   ((int)0x00000100) /* Unable to perform full check. */
 #define LOOK_INVALID ((int)0x00000200) /* Invalid sequence was found. */
 #define LOOK_BINARY  (LOOK_NUL | LOOK_LONG | LOOK_SHORT) /* May be binary. */
-#define LOOK_EOL     (LOOK_LONE_CR | LOOK_LONE_LF | LOOK_CRLF) /* Line seps. */
+#define LOOK_ANY_CR  (LOOK_LONE_CR | LOOK_CRLF) /* One or more CR chars were found. */
+#define LOOK_ANY_LF  (LOOK_LONE_LF | LOOK_CRLF) /* One or more LF chars were found. */
+#define LOOK_EOL     (LOOK_ANY_CR | LOOK_LONE_LF) /* Line seps. */
 #endif /* INTERFACE */
 
 /*
 ** Maximum length of a line in a text file, in bytes.  (2**13 = 8192 bytes)
 */
@@ -246,35 +246,32 @@
   if( n==0 ) return flags;  /* Empty file -> text */
   c = *z;
   if( c==0 ){
     flags |= LOOK_NUL;  /* NUL character in a file -> binary */
   }else if( c=='\r' ){
-    flags |= LOOK_CR;
     if( n<=1 || z[1]!='\n' ){
       flags |= LOOK_LONE_CR;  /* More chars, next char is not LF */
     }
   }
   j = (c!='\n');
-  if( !j ) flags |= (LOOK_LF | LOOK_LONE_LF);  /* Found LF as first char */
+  if( !j ) flags |= LOOK_LONE_LF;  /* Found LF as first char */
   while( !(flags&stopFlags) && --n>0 ){
     int c2 = c;
     c = *++z; ++j;
     if( c==0 ){
       flags |= LOOK_NUL;  /* NUL character in a file -> binary */
     }else if( c=='\n' ){
-      flags |= LOOK_LF;
       if( c2=='\r' ){
-        flags |= (LOOK_CR | LOOK_CRLF);  /* Found LF preceded by CR */
+        flags |= LOOK_CRLF;  /* Found LF preceded by CR */
       }else{
         flags |= LOOK_LONE_LF;
       }
       if( j>LENGTH_MASK ){
         flags |= LOOK_LONG;  /* Very long line -> binary */
       }
       j = 0;
     }else if( c=='\r' ){
-      flags |= LOOK_CR;
       if( n<=1 || z[1]!='\n' ){
         flags |= LOOK_LONE_CR;  /* More chars, next char is not LF */
       }
     }
   }
@@ -360,17 +357,16 @@
     c = UTF16_SWAP(c);
   }
   if( c==0 ){
     flags |= LOOK_NUL;  /* NUL character in a file -> binary */
   }else if( c=='\r' ){
-    flags |= LOOK_CR;
     if( n<=sizeof(WCHAR_T) || UTF16_SWAP_IF(bReverse, z[1])!='\n' ){
       flags |= LOOK_LONE_CR;  /* More chars, next char is not LF */
     }
   }
   j = (c!='\n');
-  if( !j ) flags |= (LOOK_LF | LOOK_LONE_LF);  /* Found LF as first char */
+  if( !j ) flags |= LOOK_LONE_LF;  /* Found LF as first char */
   while( 1 ){
     int c2 = c;
     n -= sizeof(WCHAR_T);
     if( (flags&stopFlags) || n<sizeof(WCHAR_T) ) break;
     c = *++z;
@@ -379,22 +375,20 @@
     }
     ++j;
     if( c==0 ){
       flags |= LOOK_NUL;  /* NUL character in a file -> binary */
     }else if( c=='\n' ){
-      flags |= LOOK_LF;
       if( c2=='\r' ){
-        flags |= (LOOK_CR | LOOK_CRLF);  /* Found LF preceded by CR */
+        flags |= LOOK_CRLF;  /* Found LF preceded by CR */
       }else{
         flags |= LOOK_LONE_LF;
       }
       if( j>UTF16_LENGTH_MASK ){
         flags |= LOOK_LONG;  /* Very long line -> binary */
       }
       j = 0;
     }else if( c=='\r' ){
-      flags |= LOOK_CR;
       if( n<=sizeof(WCHAR_T) || UTF16_SWAP_IF(bReverse, z[1])!='\n' ){
         flags |= LOOK_LONE_CR;  /* More chars, next char is not LF */
       }
     }
   }
@@ -2557,14 +2551,14 @@
   fossil_print("Starts with UTF-16 BOM: %s\n",
                fUtf16?(bRevUtf16?"reversed":"yes"):"no");
   fossil_print("Looks like UTF-%s: %s\n",fUnicode?"16":"8",
                (lookFlags&LOOK_BINARY)?"no":"yes");
   fossil_print("Has flag LOOK_NUL: %s\n",(lookFlags&LOOK_NUL)?"yes":"no");
-  fossil_print("Has flag LOOK_CR: %s\n",(lookFlags&LOOK_CR)?"yes":"no");
+  fossil_print("Has flag LOOK_CR: %s\n",(lookFlags&LOOK_ANY_CR)?"yes":"no");
   fossil_print("Has flag LOOK_LONE_CR: %s\n",
                (lookFlags&LOOK_LONE_CR)?"yes":"no");
-  fossil_print("Has flag LOOK_LF: %s\n",(lookFlags&LOOK_LF)?"yes":"no");
+  fossil_print("Has flag LOOK_LF: %s\n",(lookFlags&LOOK_ANY_LF)?"yes":"no");
   fossil_print("Has flag LOOK_LONE_LF: %s\n",
                (lookFlags&LOOK_LONE_LF)?"yes":"no");
   fossil_print("Has flag LOOK_CRLF: %s\n",(lookFlags&LOOK_CRLF)?"yes":"no");
   fossil_print("Has flag LOOK_LONG: %s\n",(lookFlags&LOOK_LONG)?"yes":"no");
   fossil_print("Has flag LOOK_INVALID: %s\n",