summaryrefslogtreecommitdiffstats
path: root/extensions/Splinter/web
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2013-05-09 11:26:10 +0200
committerByron Jones <bjones@mozilla.com>2013-05-09 11:26:10 +0200
commit044e2e4ffa11bdc792abdac7748dffe02a532122 (patch)
tree240225fb882f4e3b72d0d09a9eea83b0dc3a3b64 /extensions/Splinter/web
parent7f2ece8ca6504db73da9eec51588063e5ee2db26 (diff)
downloadbugzilla-044e2e4ffa11bdc792abdac7748dffe02a532122.tar.gz
bugzilla-044e2e4ffa11bdc792abdac7748dffe02a532122.tar.xz
Bug 815531: splinter fails to display attachment 681995 correctly
Diffstat (limited to 'extensions/Splinter/web')
-rw-r--r--extensions/Splinter/web/splinter.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/Splinter/web/splinter.js b/extensions/Splinter/web/splinter.js
index 368bd74dc..52d54b82e 100644
--- a/extensions/Splinter/web/splinter.js
+++ b/extensions/Splinter/web/splinter.js
@@ -244,7 +244,7 @@ Splinter.Patch = {
'mg'
),
HUNK_START_RE : /^@@[ \t]+-(\d+),(\d+)[ \t]+\+(\d+),(\d+)[ \t]+@@(.*)\n/mg,
- HUNK_RE : /((?:[ +\\-].*(?:\n|$))*)/mg,
+ HUNK_RE : /((?:(?!---)[ +\\-].*(?:\n|$))*)/mg,
GIT_BINARY_RE : /^diff --git a\/(\S+).*\n(?:(new|deleted) file mode \d+\n)?(?:index.*\n)?GIT binary patch\n(delta )?/mg,