Permalink
Browse files

merging from ruby trunk

  • Loading branch information...
1 parent e13ab95 commit 7880a4bc224f938e2d22f1f94315e8cd49aa6d1c @tenderlove tenderlove committed Jun 6, 2011
Showing with 3 additions and 3 deletions.
  1. +1 −1 lib/psych/nodes.rb
  2. +1 −1 test/psych/test_null.rb
  3. +1 −1 test/psych/test_struct.rb
View
@@ -31,7 +31,7 @@ module Psych
# doc = Psych::Nodes::Document.new
# seq = Psych::Nodes::Sequence.new
# scalar = Psych::Nodes::Scalar.new('foo')
- #
+ #
# # Build up our tree
# stream.children << doc
# doc.children << seq
View
@@ -10,7 +10,7 @@ def test_null_list
---
- ~
- null
--
+-
- Null
- NULL
eoyml
@@ -39,7 +39,7 @@ def test_roundtrip
def test_load
obj = Psych.load(<<-eoyml)
---- !ruby/struct:PsychStructWithIvar
+--- !ruby/struct:PsychStructWithIvar
:foo: bar
:@bar: hello
eoyml

0 comments on commit 7880a4b

Please sign in to comment.