diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-06 13:03:59 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-06 13:03:59 +0000 |
| commit | e52527a4f92e5e575ebcc7d9fe83247cae6e0ffe (patch) | |
| tree | a88a987cc6addb0728826732024d139417b1f6fb /lib | |
| parent | e5938a1157799ffcb7fe34a1a1c2093afa1cd196 (diff) | |
merge miss of r39093.
I don't understand why svn merge didn't merge any files and reported no errors.
terrible...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rexml/parsers/baseparser.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb index 95afd7add5..2df26b82f9 100644 --- a/lib/rexml/parsers/baseparser.rb +++ b/lib/rexml/parsers/baseparser.rb @@ -342,7 +342,7 @@ module REXML md = @source.match( COMMENT_PATTERN, true ) case md[1] - when /--/, /-$/ + when /--/, /-\z/ raise REXML::ParseException.new("Malformed comment", @source) end |