Mercurial Repositories > eric / file diff

--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html	Sat Apr 05 18:25:35 2014 +0200
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html	Sat Apr 05 19:55:53 2014 +0200
@@ -93,6 +93,9 @@
 <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>
@@ -301,6 +304,11 @@
 <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>)