diff --git a/src/main/scala/util/JGitUtil.scala b/src/main/scala/util/JGitUtil.scala index 0dfebe5..f4ced75 100644 --- a/src/main/scala/util/JGitUtil.scala +++ b/src/main/scala/util/JGitUtil.scala @@ -102,7 +102,7 @@ /** * the line separator of this content ("LF" or "CRLF") */ - val lineSeparator: String = if(content.exists(_.indexOf("¥r¥n") >= 0)) "CRLF" else "LF" + val lineSeparator: String = if(content.exists(_.indexOf("\r\n") >= 0)) "CRLF" else "LF" } /** diff --git a/src/main/scala/util/StringUtil.scala b/src/main/scala/util/StringUtil.scala index 9413813..dac3de3 100644 --- a/src/main/scala/util/StringUtil.scala +++ b/src/main/scala/util/StringUtil.scala @@ -54,9 +54,9 @@ * @return the converted content */ def convertLineSeparator(content: String, lineSeparator: String): String = { - val lf = content.replaceAll("¥r¥n", "¥n").replaceAll("¥r", "¥n") + val lf = content.replace("\r\n", "\n").replace("\r", "\n") if(lineSeparator == "CRLF"){ - lf.replaceAll("¥n", "¥r¥n") + lf.replace("\n", "\r\n") } else { lf }