Author: hwright
Date: Wed Aug 17 14:05:44 2011
New Revision: 1158721
URL: http://svn.apache.org/viewvc?rev=1158721&view=rev
Log:
* STATUS: Note a merge conflict.
Modified:
subversion/branches/1.7.x/STATUS
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158721&r1=1158720&r2=1158721&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 17 14:05:44 2011
@@ -145,6 +145,8 @@ Approved changes:
Fix another variant of issues #2557 and #3987: 'svnversion symlink/to/wc'.
Justification:
That syntax should work.
+ Notes:
+ Merge conflicts in the test suite.
Votes:
+1: danielsh, rhuijben, cmpilato
