Mercurial Repositories > eric / file diff

--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html	Fri Aug 23 13:06:04 2019 +0200
+++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.html	Fri Aug 23 13:06:55 2019 +0200
@@ -94,7 +94,7 @@
 </table>
 <a NAME="HgCommitDialog.__init__" ID="HgCommitDialog.__init__"></a>
 <h4>HgCommitDialog (Constructor)</h4>
-<b>HgCommitDialog</b>(<i>vcs, msg, mq, parent=None</i>)
+<b>HgCommitDialog</b>(<i>vcs, msg, mq, merge, parent=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -107,6 +107,9 @@
 </dd><dt><i>mq</i></dt>
 <dd>
 flag indicating a queue commit (boolean)
+</dd><dt><i>merge</i></dt>
+<dd>
+flag indicating a merge commit (boolean)
 </dd><dt><i>parent</i></dt>
 <dd>
 parent widget (QWidget)