summaryrefslogtreecommitdiff
path: root/vendor/assets/javascripts
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@dosire.com>2013-11-27 09:00:14 +0100
committerSytse Sijbrandij <sytse@dosire.com>2013-11-27 09:00:14 +0100
commitca1526e7ffa2b1eeccae187406987de0250c2012 (patch)
tree9d441e2e9b163c6998d3797e8bb427124499436c /vendor/assets/javascripts
parent526c2fdf48add9c5051514f987494244b5d6b45e (diff)
downloadgitlab-ce-ca1526e7ffa2b1eeccae187406987de0250c2012.tar.gz
Conventional naming for diff modes.
Diffstat (limited to 'vendor/assets/javascripts')
-rw-r--r--vendor/assets/javascripts/ace-src-noconflict/mode-diff.js2
1 files changed, 1 insertions, 1 deletions
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",