* subversion/bindings/swig/ruby/svn/wc.rb:   (merge_prop_diffs):     Renamed from mrege_prop_diffs.
* subversion/bindings/swig/ruby/svn/wc.rb:
  (merge_prop_diffs):
    Renamed from mrege_prop_diffs.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion