diff -r 334c7d0b5036 -r c1b6bc83fc76 eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Fri Aug 23 13:06:04 2019 +0200
+++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html Fri Aug 23 13:06:55 2019 +0200
@@ -63,6 +63,9 @@
<td><a href="#HgProjectHelper.__checkActions">__checkActions</a></td>
<td>Private slot to set the enabled status of actions.</td>
</tr><tr>
+<td><a href="#HgProjectHelper.__hgAbortMerge">__hgAbortMerge</a></td>
+<td>Private slot used to abort an uncommitted merge.</td>
+</tr><tr>
<td><a href="#HgProjectHelper.__hgAddSubrepository">__hgAddSubrepository</a></td>
<td>Private slot used to add a sub-repository.</td>
</tr><tr>
@@ -126,12 +129,12 @@
<td><a href="#HgProjectHelper.__hgBundle">__hgBundle</a></td>
<td>Private slot used to create a changegroup file.</td>
</tr><tr>
-<td><a href="#HgProjectHelper.__hgCancelMerge">__hgCancelMerge</a></td>
-<td>Private slot used to cancel an uncommitted merge.</td>
-</tr><tr>
<td><a href="#HgProjectHelper.__hgCloseBranch">__hgCloseBranch</a></td>
<td>Private slot used to close the current branch of the local project.</td>
</tr><tr>
+<td><a href="#HgProjectHelper.__hgCommitMerge">__hgCommitMerge</a></td>
+<td>Private slot used to commit a merge.</td>
+</tr><tr>
<td><a href="#HgProjectHelper.__hgConfigure">__hgConfigure</a></td>
<td>Private method to open the configuration dialog.</td>
</tr><tr>
@@ -311,6 +314,11 @@
<b>__checkActions</b>(<i></i>)
<p>
Private slot to set the enabled status of actions.
+</p><a NAME="HgProjectHelper.__hgAbortMerge" ID="HgProjectHelper.__hgAbortMerge"></a>
+<h4>HgProjectHelper.__hgAbortMerge</h4>
+<b>__hgAbortMerge</b>(<i></i>)
+<p>
+ Private slot used to abort an uncommitted merge.
</p><a NAME="HgProjectHelper.__hgAddSubrepository" ID="HgProjectHelper.__hgAddSubrepository"></a>
<h4>HgProjectHelper.__hgAddSubrepository</h4>
<b>__hgAddSubrepository</b>(<i></i>)
@@ -417,16 +425,16 @@
<b>__hgBundle</b>(<i></i>)
<p>
Private slot used to create a changegroup file.
-</p><a NAME="HgProjectHelper.__hgCancelMerge" ID="HgProjectHelper.__hgCancelMerge"></a>
-<h4>HgProjectHelper.__hgCancelMerge</h4>
-<b>__hgCancelMerge</b>(<i></i>)
-<p>
- Private slot used to cancel an uncommitted merge.
</p><a NAME="HgProjectHelper.__hgCloseBranch" ID="HgProjectHelper.__hgCloseBranch"></a>
<h4>HgProjectHelper.__hgCloseBranch</h4>
<b>__hgCloseBranch</b>(<i></i>)
<p>
Private slot used to close the current branch of the local project.
+</p><a NAME="HgProjectHelper.__hgCommitMerge" ID="HgProjectHelper.__hgCommitMerge"></a>
+<h4>HgProjectHelper.__hgCommitMerge</h4>
+<b>__hgCommitMerge</b>(<i></i>)
+<p>
+ Private slot used to commit a merge.
</p><a NAME="HgProjectHelper.__hgConfigure" ID="HgProjectHelper.__hgConfigure"></a>
<h4>HgProjectHelper.__hgConfigure</h4>
<b>__hgConfigure</b>(<i></i>)
