Author: danielsh
Date: Fri May 10 05:55:31 2013
New Revision: 1480884
URL: http://svn.apache.org/r1480884
Log:
* STATUS: Fix parse error.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1480884&r1=1480883&r2=1480884&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri May 10 05:55:31 2013
@@ -38,7 +38,7 @@ Candidate changes:
+1: julianfoad
+1: stsp (for 1.8.0, but not any 1.8.x since it changes the UI)
- * 1477294, r1480616, r1480641, r1480642, r1480664, r1480669
+ * r1477294, r1480616, r1480641, r1480642, r1480664, r1480669
Further improvements for interactive resolution of property conflicts.
Allow conflicted properties to be edited and resolved to the edited value.
Justification:
