bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jsdiff",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "main": [
     "diff.js"
   ],

diff.js

@@ -270,13 +270,8 @@
             lastLineLastChar = lastLine ? lastLine[lastLine.length - 1] : '';
 
         // 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) {
           if (this.ignoreTrim) {
             line = line.trim();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "diff",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "A javascript text diff implementation.",
   "keywords": [
     "diff",

release-notes.md

@@ -2,7 +2,12 @@
 
 ## Development
 
-[Commits](https://github.com/kpdecker/jsdiff/compare/v1.3.0...master)
+[Commits](https://github.com/kpdecker/jsdiff/compare/v1.3.1...master)
+
+## v1.3.1 - March 13th, 2015
+- [#52](https://github.com/kpdecker/jsdiff/pull/52) - Fix for #51 Wrong result of JsDiff.diffLines ([@felicienfrancois](https://api.github.com/users/felicienfrancois))
+
+[Commits](https://github.com/kpdecker/jsdiff/compare/v1.3.0...v1.3.1)
 
 ## v1.3.0 - March 2nd, 2015
 - [#47](https://github.com/kpdecker/jsdiff/pull/47) - Adding Diff Trimmed Lines ([@JamesGould123](https://api.github.com/users/JamesGould123))

test/diffTest.js

@@ -198,6 +198,13 @@ describe('#diffLines', function() {
       'line\r\nnew value\r\nline');
     diff.convertChangesToXML(diffResult).should.equal('line\r\n<ins>new value\r\n</ins><del>old value \r\n</del>line');
   });
+
+  it('should handle empty lines', function() {
+    var diffResult = diff.diffLines(
+      'line\n\nold value \n\nline',
+      'line\n\nnew value\n\nline');
+    diff.convertChangesToXML(diffResult).should.equal('line\n\n<ins>new value\n</ins><del>old value \n</del>\nline');
+  });
 });
 
 // Trimmed Line Diff