Comparing version 1.3.0 to 1.3.1
@@ -273,9 +273,4 @@ /* See LICENSE file for terms of use */ | ||
// Merge lines that may contain windows new lines | ||
if (line === '\n' && (lastLineLastChar === '\r' || lastLineLastChar === '\n')) { | ||
if (this.ignoreTrim || lastLineLastChar === '\n'){ | ||
//to avoid merging to \n\n, remove \n and add \r\n. | ||
if (line === '\n' && lastLineLastChar === '\r') { | ||
retLines[retLines.length - 1] = retLines[retLines.length - 1].slice(0,-1) + '\r\n'; | ||
} else { | ||
retLines[retLines.length - 1] += '\n'; | ||
} | ||
} else if (line) { | ||
@@ -282,0 +277,0 @@ if (this.ignoreTrim) { |
{ | ||
"name": "diff", | ||
"version": "1.3.0", | ||
"version": "1.3.1", | ||
"description": "A javascript text diff implementation.", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
26844
486