docs/html/commands.html

changeset 563
3dffe58a573f
parent 429
1607450065ba
child 704
8b88efcbf56f
--- a/docs/html/commands.html	Wed Apr 10 13:48:44 2019 +0200
+++ b/docs/html/commands.html	Wed Apr 10 13:50:24 2019 +0200
@@ -53,6 +53,7 @@
 						<li><a href="pull.html">pull</a></li>
 						<li><a href="push.html">push</a></li>
 						<li><a href="archive.html">archive</a></li>
+                                                <li><a href="list-conflicts.html">list-conflicts</a></li>
 						<li><a href="resolve-conflicts.html">resolve-conflicts</a></li>
 						<li><a href="delete-conflicts.html">delete-conflicts</a></li>
 						<li><a href="trash-info.html">trash-info</a></li>

mercurial