subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcor...@apache.org
Subject svn commit: r1783953 - /subversion/site/publish/docs/release-notes/1.10.html
Date Tue, 21 Feb 2017 22:34:49 GMT
Author: jcorvel
Date: Tue Feb 21 22:34:48 2017
New Revision: 1783953

URL: http://svn.apache.org/viewvc?rev=1783953&view=rev
Log:
* publish/docs/release-notes/1.10.html:
  (#conflict-resolver): generalize local change "delete directory" to
   "delete item".

Modified:
    subversion/site/publish/docs/release-notes/1.10.html

Modified: subversion/site/publish/docs/release-notes/1.10.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.10.html?rev=1783953&r1=1783952&r2=1783953&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.10.html (original)
+++ subversion/site/publish/docs/release-notes/1.10.html Tue Feb 21 22:34:48 2017
@@ -383,14 +383,15 @@ which contains at least 2 segments and i
   </tr>
   <tr>
     <td><ul>
-      <li>delete directory</li>
+      <li>delete item</li>
     </ul></td>
     <td><ul>
+      <li>edit file</li>
       <li>any change inside directory</li>
     </ul></td>
     <td>update, switch, merge</td>
     <td><ul>
-      <li>keep working copy state (deleted directory),<br>
+      <li>keep working copy state (deleted file / directory),<br>
       discarding incoming changes</li>
     </ul></td>
   </tr>



Mime
View raw message