Author: stsp
Date: Tue May 17 13:50:47 2011
New Revision: 1104251
URL: http://svn.apache.org/viewvc?rev=1104251&view=rev
Log:
* STATUS: Note that r1100213 conflicts.
Modified:
subversion/branches/1.6.x/STATUS
Modified: subversion/branches/1.6.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1104251&r1=1104250&r2=1104251&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Tue May 17 13:50:47 2011
@@ -67,6 +67,7 @@ Candidate changes:
corruption conditions.
Votes:
+1: danielsh, gstein
+ +0: stsp (trunk commit reviews fine, but there are merge conflicts)
* r939000, r939002, r1102803
Provide clueful error when editor drive refers revision > HEAD.
