Checkout
stsp
committed
on 12 Oct 16
[Note from the future: reverted in r1795871.]

* subversion/bindings/swig/ruby/test/test_fs.rb
(test_delta): Expect and resolve text confl… Show more
[Note from the future: reverted in r1795871.]

* subversion/bindings/swig/ruby/test/test_fs.rb

 (test_delta): Expect and resolve text conflict to account for new behaviour

  with flagging text conflicts since r1731699.

Show less