Author: julianfoad
Date: Mon Feb 12 15:10:10 2018
New Revision: 1823983

URL: http://svn.apache.org/viewvc?rev=1823983&view=rev
Log:
* STATUS: Make the conflict resolution instructions for r1823966 
machine-readable.

Modified:
    subversion/branches/1.10.x/STATUS

Modified: subversion/branches/1.10.x/STATUS
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1823983&r1=1823982&r2=1823983&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Mon Feb 12 15:10:10 2018
@@ -20,7 +20,7 @@ Candidate changes:
    Justification:
      Avoids potential command-line-quoting-safety issues.
    Notes:
-     Manual merge needed, followed by 'svn revert subversion/svn/shelf-cmd.c'.
+     --accept=working
    Votes:
      +1: julianfoad
 


Reply via email to