liuxm/Mergely
1
0
Fork 0
forked from lxm_front/Mergely
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes parsing diffs that contains text that looks like a valid diff, but clearly is not.

Browse Source
This commit is contained in:
Jamie Peabody
2014-03-10 20:28:15 +00:00
parent bf96bc51a1
commit ad10800fa3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mergely.js
View File

@@ -12,7 +12,7 @@ Mgly.Timer = function(){
self.start();
}
Mgly.ChangeExpression = new RegExp(/(\d+(?:,\d+)?)([acd])(\d+(?:,\d+)?)/);
Mgly.ChangeExpression = new RegExp(/(^(?![><-])*\d+(?:,\d+)?)([acd])(\d+(?:,\d+)?)/);
Mgly.DiffParser = function(diff) {
var changes = [];