subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1622198 - /subversion/branches/1.8.x/STATUS
Date Wed, 03 Sep 2014 09:37:46 GMT
Author: julianfoad
Date: Wed Sep  3 09:37:45 2014
New Revision: 1622198

URL: http://svn.apache.org/r1622198
Log:
* STATUS: Vote for r1620332, removing broken conflict resolver options.

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=1622198&r1=1622197&r2=1622198&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Sep  3 09:37:45 2014
@@ -156,7 +156,7 @@ Candidate changes:
    Notes:
      Run merge with --accept theirs-conflict
    Votes:
-     +1: stsp
+     +1: stsp, julianfoad
 
  * r1621978, r1621981
    Fix changelist filtering for repos-WC and WC-WC diffs.



Mime
View raw message