Checkout
joeswatosh
committed
on 01 Nov 08
Follow on to r33082: 'Merge the tree-conflicts branch back to trunk. This
implements basic tree conflict detection for most cases.'

Since … Show more
Follow on to r33082: 'Merge the tree-conflicts branch back to trunk. This

implements basic tree conflict detection for most cases.'

Since the directory in this test is now being detected as conflicted, just

mark it resolved and move on.

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

 (SvnClientTest#assert_merge): Mark the directory conflict resolved.

Show less