Author: stsp
Date: Wed Jun 12 11:35:32 2013
New Revision: 1492154
URL: http://svn.apache.org/r1492154
Log:
STATUS: Add r1492152 to conflict callback menu fixes.
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=1492154&r1=1492153&r2=1492154&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Jun 12 11:35:32 2013
@@ -99,7 +99,7 @@ Candidate changes:
Votes:
+1: stefan2, blair
- * r1491739, r1491755, r1491762
+ * r1491739, r1491755, r1491762, r1492152
Improve interactive conflict resolution menu.
Justification:
The current menu is too hard to figure out for users.
