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

Posted to commits@subversion.apache.org by rh...@apache.org on 2012/09/11 14:14:18 UTC

svn propchange: r1383371 - svn:log

Author: rhuijben
Revision: 1383371
Modified property: svn:log

Modified: svn:log at Tue Sep 11 12:14:18 2012
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue Sep 11 12:14:18 2012
@@ -1,7 +1,7 @@
 On the 1.6.x-testsuite-apr-hash-order branch, merge r1292507 from trunk.
 
 Allows the svnsync tests to pass reliably with APR-1.4.6.
-Conflict resolution was trivial, expect for one change:
+Conflict resolution was trivial, except for one change:
 
 * subversion/tests/cmdline/svntest/verify.py
   (DumpParser.get_props): Sort the list of properties parsed from