diff -r cf4f22a19dc6 -r 0a4e5082cbc6 Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html --- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html Mon Feb 24 19:27:39 2014 +0100 +++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html Mon Feb 24 19:43:31 2014 +0100 @@ -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>