diff -r 334c7d0b5036 -r c1b6bc83fc76 eric6/Documentation/Help/source.qhp
--- a/eric6/Documentation/Help/source.qhp Fri Aug 23 13:06:04 2019 +0200
+++ b/eric6/Documentation/Help/source.qhp Fri Aug 23 13:06:55 2019 +0200
@@ -8704,6 +8704,7 @@
<keyword name="Hg.__monitorRepoIniFile" id="Hg.__monitorRepoIniFile" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__monitorRepoIniFile" />
<keyword name="Hg.__vcsCommit_Step2" id="Hg.__vcsCommit_Step2" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.__vcsCommit_Step2" />
<keyword name="Hg._createStatusMonitorThread" id="Hg._createStatusMonitorThread" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg._createStatusMonitorThread" />
+ <keyword name="Hg.canCommitMerge" id="Hg.canCommitMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.canCommitMerge" />
<keyword name="Hg.canPull" id="Hg.canPull" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.canPull" />
<keyword name="Hg.canPush" id="Hg.canPush" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.canPush" />
<keyword name="Hg.clearStatusCache" id="Hg.clearStatusCache" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.clearStatusCache" />
@@ -8713,6 +8714,7 @@
<keyword name="Hg.getHgSubPath" id="Hg.getHgSubPath" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.getHgSubPath" />
<keyword name="Hg.getPlugin" id="Hg.getPlugin" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.getPlugin" />
<keyword name="Hg.hasSubrepositories" id="Hg.hasSubrepositories" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hasSubrepositories" />
+ <keyword name="Hg.hgAbortMerge" id="Hg.hgAbortMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgAbortMerge" />
<keyword name="Hg.hgAddSubrepository" id="Hg.hgAddSubrepository" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgAddSubrepository" />
<keyword name="Hg.hgAnnotate" id="Hg.hgAnnotate" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgAnnotate" />
<keyword name="Hg.hgArchive" id="Hg.hgArchive" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgArchive" />
@@ -8728,7 +8730,6 @@
<keyword name="Hg.hgBookmarkRename" id="Hg.hgBookmarkRename" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBookmarkRename" />
<keyword name="Hg.hgBranch" id="Hg.hgBranch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBranch" />
<keyword name="Hg.hgBundle" id="Hg.hgBundle" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgBundle" />
- <keyword name="Hg.hgCancelMerge" id="Hg.hgCancelMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgCancelMerge" />
<keyword name="Hg.hgConflicts" id="Hg.hgConflicts" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgConflicts" />
<keyword name="Hg.hgCopy" id="Hg.hgCopy" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgCopy" />
<keyword name="Hg.hgCreateIgnoreFile" id="Hg.hgCreateIgnoreFile" ref="eric6.Plugins.VcsPlugins.vcsMercurial.hg.html#Hg.hgCreateIgnoreFile" />
@@ -9341,6 +9342,7 @@
<keyword name="HgProjectHelper" id="HgProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper" />
<keyword name="HgProjectHelper (Constructor)" id="HgProjectHelper (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__init__" />
<keyword name="HgProjectHelper.__checkActions" id="HgProjectHelper.__checkActions" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__checkActions" />
+ <keyword name="HgProjectHelper.__hgAbortMerge" id="HgProjectHelper.__hgAbortMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgAbortMerge" />
<keyword name="HgProjectHelper.__hgAddSubrepository" id="HgProjectHelper.__hgAddSubrepository" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgAddSubrepository" />
<keyword name="HgProjectHelper.__hgArchive" id="HgProjectHelper.__hgArchive" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgArchive" />
<keyword name="HgProjectHelper.__hgBackout" id="HgProjectHelper.__hgBackout" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBackout" />
@@ -9362,8 +9364,8 @@
<keyword name="HgProjectHelper.__hgBranch" id="HgProjectHelper.__hgBranch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBranch" />
<keyword name="HgProjectHelper.__hgBranchList" id="HgProjectHelper.__hgBranchList" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBranchList" />
<keyword name="HgProjectHelper.__hgBundle" id="HgProjectHelper.__hgBundle" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgBundle" />
- <keyword name="HgProjectHelper.__hgCancelMerge" id="HgProjectHelper.__hgCancelMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgCancelMerge" />
<keyword name="HgProjectHelper.__hgCloseBranch" id="HgProjectHelper.__hgCloseBranch" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgCloseBranch" />
+ <keyword name="HgProjectHelper.__hgCommitMerge" id="HgProjectHelper.__hgCommitMerge" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgCommitMerge" />
<keyword name="HgProjectHelper.__hgConfigure" id="HgProjectHelper.__hgConfigure" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgConfigure" />
<keyword name="HgProjectHelper.__hgCreateIgnore" id="HgProjectHelper.__hgCreateIgnore" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgCreateIgnore" />
<keyword name="HgProjectHelper.__hgDeleteBackups" id="HgProjectHelper.__hgDeleteBackups" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html#HgProjectHelper.__hgDeleteBackups" />
