From ca1526e7ffa2b1eeccae187406987de0250c2012 Mon Sep 17 00:00:00 2001
From: Sytse Sijbrandij <sytse@dosire.com>
Date: Wed, 27 Nov 2013 09:00:14 +0100
Subject: Conventional naming for diff modes.

---
 vendor/assets/javascripts/ace-src-noconflict/mode-diff.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vendor')

diff --git a/vendor/assets/javascripts/ace-src-noconflict/mode-diff.js b/vendor/assets/javascripts/ace-src-noconflict/mode-diff.js
index 75e26cc7056..8d1e7cee096 100644
--- a/vendor/assets/javascripts/ace-src-noconflict/mode-diff.js
+++ b/vendor/assets/javascripts/ace-src-noconflict/mode-diff.js
@@ -66,7 +66,7 @@ var DiffHighlightRules = function() {
                 "regex": "^(?:\\*{15}|={67}|-{3}|\\+{3})$",
                 "token": "punctuation.definition.separator.diff",
                 "name": "keyword"
-            }, { //diff.range.unified
+            }, { //diff.range.inline
                 "regex": "^(@@)(\\s*.+?\\s*)(@@)(.*)$",
                 "token": [
                     "constant",
-- 
cgit v1.2.3