Updated for 3.4.2

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "Mergely",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "homepage": "https://github.com/wickedest/Mergely",
   "description": "Merge and diff documents online",
   "main": [
@@ -29,7 +29,7 @@
     "url": "git://github.com/wickedest/Mergely"
   },
   "dependencies": {
-    "mergely": "https://github.com/wickedest/Mergely.git#3.4.1",
+    "mergely": "https://github.com/wickedest/Mergely.git#3.4.2",
     "jquery": "<=2.1.3",
     "codemirror": "<=5.11.0"
   }

lib/mergely.js

@@ -677,7 +677,12 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
 		if (this.settings.rhs_margin != 'left') {
 			this.element.append(rmargin);
 		}
-		//codemirror
+
+		// get current diff border color
+		var color = $('<div style="display:none" class="mergely current start" />').appendTo('body').css('border-top-color');
+		this.current_diff_color = color;
+
+		// codemirror
 		var cmstyle = '#' + this.id + ' .CodeMirror-gutter-text { padding: 5px 0 0 0; }' +
 			'#' + this.id + ' .CodeMirror-lines pre, ' + '#' + this.id + ' .CodeMirror-gutter-text pre { line-height: 18px; }' +
 			'.CodeMirror-linewidget { overflow: hidden; };';
@@ -1487,9 +1492,9 @@ jQuery.extend(Mgly.CodeMirrorDiffView.prototype, {
 		for (var i = 0; i < changes.length; ++i) {
 			var change = changes[i];
 			var fill = this.settings.fgcolor[change['op']];
-            if (this._current_diff==i) {
+			if (this._current_diff === i) {
-                fill = '#000';
+				fill = this.current_diff_color;
-            }
+			}
 
 			this.trace('draw', change);
 			// margin indicators