Mercurial Repositories > eric / file diff

--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html	Mon Sep 02 18:52:31 2019 +0200
+++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html	Mon Sep 02 18:58:29 2019 +0200
@@ -62,8 +62,8 @@
 <td><a href="#HgStatusDialog.__init__">HgStatusDialog</a></td>
 <td>Constructor</td>
 </tr><tr>
-<td><a href="#HgStatusDialog.__actionsMenuHovered">__actionsMenuHovered</a></td>
-<td>Private slot to show the tooltip for an action menu entry.</td>
+<td><a href="#HgStatusDialog.__abortMerge">__abortMerge</a></td>
+<td>Private slot used to abort an uncommitted merge.</td>
 </tr><tr>
 <td><a href="#HgStatusDialog.__add">__add</a></td>
 <td>Private slot to handle the Add context menu entry.</td>
@@ -74,6 +74,9 @@
 <td><a href="#HgStatusDialog.__commitDeselectAll">__commitDeselectAll</a></td>
 <td>Private slot to deselect all entries from commit.</td>
 </tr><tr>
+<td><a href="#HgStatusDialog.__commitMerge">__commitMerge</a></td>
+<td>Private slot to handle the Commit Merge context menu entry.</td>
+</tr><tr>
 <td><a href="#HgStatusDialog.__commitSelect">__commitSelect</a></td>
 <td>Private slot to select or deselect all entries.</td>
 </tr><tr>
@@ -212,17 +215,12 @@
 <dd>
 parent widget (QWidget)
 </dd>
-</dl><a NAME="HgStatusDialog.__actionsMenuHovered" ID="HgStatusDialog.__actionsMenuHovered"></a>
-<h4>HgStatusDialog.__actionsMenuHovered</h4>
-<b>__actionsMenuHovered</b>(<i>action</i>)
+</dl><a NAME="HgStatusDialog.__abortMerge" ID="HgStatusDialog.__abortMerge"></a>
+<h4>HgStatusDialog.__abortMerge</h4>
+<b>__abortMerge</b>(<i></i>)
 <p>
-        Private slot to show the tooltip for an action menu entry.
-</p><dl>
-<dt><i>action</i> (QAction)</dt>
-<dd>
-action to show tooltip for
-</dd>
-</dl><a NAME="HgStatusDialog.__add" ID="HgStatusDialog.__add"></a>
+        Private slot used to abort an uncommitted merge.
+</p><a NAME="HgStatusDialog.__add" ID="HgStatusDialog.__add"></a>
 <h4>HgStatusDialog.__add</h4>
 <b>__add</b>(<i></i>)
 <p>
@@ -237,6 +235,11 @@
 <b>__commitDeselectAll</b>(<i></i>)
 <p>
         Private slot to deselect all entries from commit.
+</p><a NAME="HgStatusDialog.__commitMerge" ID="HgStatusDialog.__commitMerge"></a>
+<h4>HgStatusDialog.__commitMerge</h4>
+<b>__commitMerge</b>(<i></i>)
+<p>
+        Private slot to handle the Commit Merge context menu entry.
 </p><a NAME="HgStatusDialog.__commitSelect" ID="HgStatusDialog.__commitSelect"></a>
 <h4>HgStatusDialog.__commitSelect</h4>
 <b>__commitSelect</b>(<i>selected</i>)