Author: julianfoad
Date: Mon Jun 25 16:57:14 2018
New Revision: 1834343
URL: http://svn.apache.org/viewvc?rev=1834343&view=rev
Log:
* publish/roadmap.html
(next-release-status): Add 'conflict resolver improvements'.
Modified:
subversion/site/publish/roadmap.html
Modified: subversion/site/publish/roadmap.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/roadmap.html?rev=1834343&r1=1834342&r2=1834343&view=diff
==============================================================================
--- subversion/site/publish/roadmap.html (original)
+++ subversion/site/publish/roadmap.html Mon Jun 25 16:57:14 2018
@@ -328,6 +328,12 @@ numbering, compatibility, and deprecatio
Status in 1.11 will be <i>"experimental"</i>.
</td>
</tr>
+ <tr class="task-level-1 in-progress">
+ <td class="task-name">Conflict resolver improvements</td>
+ <td class="task-status">In progress</td>
+ <td>Ongoing improvements since 1.10.
+ </td>
+ </tr>
<!-- PUT DEFERRED ITEMS DOWN HERE BELOW THIS DIVIDER ROW -->
<tr><td colspan="3" class="divider">Items originally planned for, but
