Mercurial Repositories > eric / file diff

--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html	Sun Sep 04 16:05:27 2011 +0200
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html	Sun Sep 04 16:06:54 2011 +0200
@@ -51,6 +51,10 @@
 <table>
 <tr><td>None</td></tr>
 </table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
 <h3>Methods</h3>
 <table>
 <tr>
@@ -61,6 +65,10 @@
 <td>Public method to retrieve the merge data.</td>
 </tr>
 </table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
 <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a>
 <h4>HgMergeDialog (Constructor)</h4>
 <b>HgMergeDialog</b>(<i>force, tagsList, branchesList, parent = None</i>)