Author: jcorvel
Revision: 1764470
Modified property: svn:log
Modified: svn:log at Mon May 22 23:39:40 2017
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Mon May 22 23:39:40 2017
@@ -1,3 +1,5 @@
+[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.