Author: julianfoad Date: Mon Feb 12 15:07:52 2018 New Revision: 1823982 URL: http://svn.apache.org/viewvc?rev=1823982&view=rev Log: * STATUS: Add conflict resolution instructions for r1823966.
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=1823982&r1=1823981&r2=1823982&view=diff ============================================================================== --- subversion/branches/1.10.x/STATUS (original) +++ subversion/branches/1.10.x/STATUS Mon Feb 12 15:07:52 2018 @@ -19,6 +19,8 @@ Candidate changes: Shelving: fix unsafe 'system' calls. Justification: Avoids potential command-line-quoting-safety issues. + Notes: + Manual merge needed, followed by 'svn revert subversion/svn/shelf-cmd.c'. Votes: +1: julianfoad