subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1182022 - /subversion/branches/1.7.x/STATUS
Date Tue, 11 Oct 2011 18:56:40 GMT
Author: philip
Date: Tue Oct 11 18:56:40 2011
New Revision: 1182022

URL: http://svn.apache.org/viewvc?rev=1182022&view=rev
Log:
* STATUS: Remove conflict resolution

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=1182022&r1=1182021&r2=1182022&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue Oct 11 18:56:40 2011
@@ -113,8 +113,6 @@ Approved changes:
    Use the correct function to copy repositories in the testsuite.
    Justification:
      Prevent occassional test failure.
-   Notes:
-     Merge conflict on externals_tests.py resolved with --accept mf.
    Votes:
      +1: philip
      +0: pburba (Ideally this would be done as a subtree merge targeting



Mime
View raw message