Index: subversion/bindings/swig/ruby/test/test_client.rb
===================================================================
--- subversion/bindings/swig/ruby/test/test_client.rb	(revision 25312)
+++ subversion/bindings/swig/ruby/test/test_client.rb	(working copy)
@@ -837,7 +837,7 @@
     File.open(branch_path, "w") {|f| f.print(src)}
     rev2 = ctx.commit(@wc_path).revision
 
-    assert_equal({}, ctx.merge_info(trunk))
+    assert_nil(ctx.merge_info(trunk))
     ctx.merge(branch, rev1, branch, rev2, trunk)
     merge_info = ctx.merge_info(trunk)
     assert_equal(["/branch"], merge_info.keys)
@@ -897,7 +897,7 @@
     File.open(branch_path, "w") {|f| f.print(src)}
     rev2 = ctx.commit(@wc_path).revision
 
-    assert_equal({}, ctx.merge_info(trunk))
+    assert_nil(ctx.merge_info(trunk))
     ctx.merge_peg(branch, rev1, rev2, trunk)
     merge_info = ctx.merge_info(trunk)
     assert_equal(["/branch"], merge_info.keys)
Index: subversion/bindings/swig/ruby/svn/client.rb
===================================================================
--- subversion/bindings/swig/ruby/svn/client.rb	(revision 25312)
+++ subversion/bindings/swig/ruby/svn/client.rb	(working copy)
@@ -622,6 +622,7 @@
 
       def merge_info(path_or_url, revision=nil)
         info = Client.get_mergeinfo(path_or_url, revision, self)
+        return nil if info.nil?
         Core::MergeInfo.new(info)
       end
       alias_method :mergeinfo, :merge_info