Mercurial Repositories > eric / changeset

Binary file eric6/Documentation/Help/source.qch has changed

--- a/eric6/Documentation/Help/source.qhp	Sun Sep 01 17:36:48 2019 +0200
+++ b/eric6/Documentation/Help/source.qhp	Mon Sep 02 19:29:26 2019 +0200
@@ -9643,10 +9643,12 @@
       <keyword name="HgStatusDialog" id="HgStatusDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog" />
       <keyword name="HgStatusDialog (Constructor)" id="HgStatusDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__init__" />
       <keyword name="HgStatusDialog (Module)" id="HgStatusDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html" />
+      <keyword name="HgStatusDialog.__abortMerge" id="HgStatusDialog.__abortMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__abortMerge" />
       <keyword name="HgStatusDialog.__actionsMenuHovered" id="HgStatusDialog.__actionsMenuHovered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__actionsMenuHovered" />
       <keyword name="HgStatusDialog.__add" id="HgStatusDialog.__add" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__add" />
       <keyword name="HgStatusDialog.__commit" id="HgStatusDialog.__commit" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__commit" />
       <keyword name="HgStatusDialog.__commitDeselectAll" id="HgStatusDialog.__commitDeselectAll" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__commitDeselectAll" />
+      <keyword name="HgStatusDialog.__commitMerge" id="HgStatusDialog.__commitMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__commitMerge" />
       <keyword name="HgStatusDialog.__commitSelect" id="HgStatusDialog.__commitSelect" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__commitSelect" />
       <keyword name="HgStatusDialog.__commitSelectAll" id="HgStatusDialog.__commitSelectAll" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__commitSelectAll" />
       <keyword name="HgStatusDialog.__committed" id="HgStatusDialog.__committed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__committed" />

--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html	Sun Sep 01 17:36:48 2019 +0200
+++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html	Mon Sep 02 19:29:26 2019 +0200
@@ -62,6 +62,9 @@
 <td><a href="#HgStatusDialog.__init__">HgStatusDialog</a></td>
 <td>Constructor</td>
 </tr><tr>
+<td><a href="#HgStatusDialog.__abortMerge">__abortMerge</a></td>
+<td>Private slot used to abort an uncommitted merge.</td>
+</tr><tr>
 <td><a href="#HgStatusDialog.__actionsMenuHovered">__actionsMenuHovered</a></td>
 <td>Private slot to show the tooltip for an action menu entry.</td>
 </tr><tr>
@@ -74,6 +77,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,7 +218,12 @@
 <dd>
 parent widget (QWidget)
 </dd>
-</dl><a NAME="HgStatusDialog.__actionsMenuHovered" ID="HgStatusDialog.__actionsMenuHovered"></a>
+</dl><a NAME="HgStatusDialog.__abortMerge" ID="HgStatusDialog.__abortMerge"></a>
+<h4>HgStatusDialog.__abortMerge</h4>
+<b>__abortMerge</b>(<i></i>)
+<p>
+        Private slot used to abort an uncommitted merge.
+</p><a NAME="HgStatusDialog.__actionsMenuHovered" ID="HgStatusDialog.__actionsMenuHovered"></a>
 <h4>HgStatusDialog.__actionsMenuHovered</h4>
 <b>__actionsMenuHovered</b>(<i>action</i>)
 <p>
@@ -237,6 +248,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>)