From d010d44d30285185c5765ac4fc66007dbb40516e Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 20 Oct 2016 14:55:00 +0300
Subject: [PATCH] IDEA-125272 git: do not fail to annotate file with "CR"
 separators

* git doesn't treat them as line separators
* remove support of "LFCR" separators that in not a thing
---
 plugins/git4idea/src/git4idea/util/StringScanner.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/util/StringScanner.java b/plugins/git4idea/src/git4idea/util/StringScanner.java
index 2d7d1d1cf6da..699d9db3b8f4 100644
--- a/plugins/git4idea/src/git4idea/util/StringScanner.java
+++ b/plugins/git4idea/src/git4idea/util/StringScanner.java
@@ -55,7 +55,7 @@ public class StringScanner {
       return true;
     }
     final char ch = myText.charAt(myPosition);
-    return ch == '\n' || ch == '\r';
+    return ch == '\n';
   }
 
   /**
@@ -69,7 +69,7 @@ public class StringScanner {
       final char ch = myText.charAt(myPosition++);
       if (hasMoreData()) {
         final char ch2 = myText.charAt(myPosition);
-        if (ch == '\n' && ch2 == '\r' || ch == '\r' && ch2 == '\n') {
+        if (ch == '\r' && ch2 == '\n') {
           myPosition++;
         }
       }