Author: stsp
Date: Wed Oct 12 13:32:58 2016
New Revision: 1764465
URL: http://svn.apache.org/viewvc?rev=1764465&view=rev
Log:
* subversion/bindings/swig/ruby/test/test_core.rb
(test_diff_merge): Update expected output to account for new behaviour
with flagging text conflicts since r1731699.
Modified:
subversion/trunk/subversion/bindings/swig/ruby/test/test_core.rb
Modified: subversion/trunk/subversion/bindings/swig/ruby/test/test_core.rb
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/test/test_core.rb?rev=1764465&r1=1764464&r2=1764465&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/ruby/test/test_core.rb (original)
+++ subversion/trunk/subversion/bindings/swig/ruby/test/test_core.rb Wed Oct 12
13:32:58 2016
@@ -472,9 +472,19 @@ EOS
latest.close
expected = <<-EOD
+<<<<<<< #{modified.path}
+a
+ b
- b
+||||||| #{original.path}
+a
+ b
+c
+=======
+ b
+c
+>>>>>>> #{latest.path}
d
e
EOD
