Mercurial Repositories > eric / file diff

diff -r 96232974dcdb -r 645c12de6b0c Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html
--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html	Sun Mar 30 22:00:14 2014 +0200
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html	Thu Apr 03 23:05:31 2014 +0200
@@ -97,14 +97,11 @@
 </table>
 <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a>
 <h4>HgMergeDialog (Constructor)</h4>
-<b>HgMergeDialog</b>(<i>force, tagsList, branchesList, bookmarksList=None, parent=None</i>)
+<b>HgMergeDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>force</i></dt>
-<dd>
-flag indicating a forced merge (boolean)
-</dd><dt><i>tagsList</i></dt>
+<dt><i>tagsList</i></dt>
 <dd>
 list of tags (list of strings)
 </dd><dt><i>branchesList</i></dt>