You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2013/01/15 17:02:09 UTC

svn propchange: r1433468 - svn:log

Author: stsp
Revision: 1433468
Modified property: svn:log

Modified: svn:log at Tue Jan 15 16:02:09 2013
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue Jan 15 16:02:09 2013
@@ -2,6 +2,6 @@
    (update_moved_dir_leaf_del): Update this test to expect the current
     behaviour of the trunk code. Instead of expecting an update to
     automatically update a locally moved subtree, expect a tree conflict
-    to be flagged first, and except 'svn resolve --accept=mine-conflict' to
+    to be flagged first, and expect 'svn resolve --accept=mine-conflict' to
     automatically apply the update to the locally moved subtree.
     Remove XFail marker, since this test is now passing.