Mercurial Repositories > eric / file diff

--- a/eric6/Documentation/Help/source.qhp	Sun Sep 01 17:36:48 2019 +0200
+++ b/eric6/Documentation/Help/source.qhp	Mon Sep 02 19:29:26 2019 +0200
@@ -9643,10 +9643,12 @@
       <keyword name="HgStatusDialog" id="HgStatusDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog" />
       <keyword name="HgStatusDialog (Constructor)" id="HgStatusDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__init__" />
       <keyword name="HgStatusDialog (Module)" id="HgStatusDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html" />
+      <keyword name="HgStatusDialog.__abortMerge" id="HgStatusDialog.__abortMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__abortMerge" />
       <keyword name="HgStatusDialog.__actionsMenuHovered" id="HgStatusDialog.__actionsMenuHovered" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__actionsMenuHovered" />
       <keyword name="HgStatusDialog.__add" id="HgStatusDialog.__add" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__add" />
       <keyword name="HgStatusDialog.__commit" id="HgStatusDialog.__commit" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__commit" />
       <keyword name="HgStatusDialog.__commitDeselectAll" id="HgStatusDialog.__commitDeselectAll" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__commitDeselectAll" />
+      <keyword name="HgStatusDialog.__commitMerge" id="HgStatusDialog.__commitMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__commitMerge" />
       <keyword name="HgStatusDialog.__commitSelect" id="HgStatusDialog.__commitSelect" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__commitSelect" />
       <keyword name="HgStatusDialog.__commitSelectAll" id="HgStatusDialog.__commitSelectAll" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__commitSelectAll" />
       <keyword name="HgStatusDialog.__committed" id="HgStatusDialog.__committed" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html#HgStatusDialog.__committed" />