From ad10800fa3e74aacbef289214fa6f4632b012d52 Mon Sep 17 00:00:00 2001
From: Jamie Peabody <jamie.peabody@gmail.com>
Date: Mon, 10 Mar 2014 20:28:15 +0000
Subject: [PATCH] Fixes parsing diffs that contains text that looks like a
 valid diff, but clearly is not.

---
 lib/mergely.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mergely.js b/lib/mergely.js
index 31e2fdb..1fe2c6d 100644
--- a/lib/mergely.js
+++ b/lib/mergely.js
@@ -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 = [];