You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2018/09/24 16:01:07 UTC

svn commit: r1841869 - /subversion/branches/1.11.x/STATUS

Author: julianfoad
Date: Mon Sep 24 16:01:07 2018
New Revision: 1841869

URL: http://svn.apache.org/viewvc?rev=1841869&view=rev
Log:
* STATUS: Note that the merge of r1841719 needs '--accept=12'.

Modified:
    subversion/branches/1.11.x/STATUS

Modified: subversion/branches/1.11.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.11.x/STATUS?rev=1841869&r1=1841868&r2=1841869&view=diff
==============================================================================
--- subversion/branches/1.11.x/STATUS (original)
+++ subversion/branches/1.11.x/STATUS Mon Sep 24 16:01:07 2018
@@ -28,6 +28,7 @@ Candidate changes:
    Add support for 'local missing' conflicts with directories.
    Justification:
      This case already works with files. Now also works with directories.
+   Notes: merge needs --accept=12
    Votes:
      +1: stsp, jcorvel