Mercurial Repositories > eric / file diff

--- a/eric6/APIs/Python3/eric6.api	Fri Aug 23 13:06:04 2019 +0200
+++ b/eric6/APIs/Python3/eric6.api	Fri Aug 23 13:06:55 2019 +0200
@@ -6078,7 +6078,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.on_recentComboBox_activated?4(txt)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.rejected?7
 eric6.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.showEvent?4(evt)
-eric6.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog?1(vcs, msg, mq, parent=None)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog?1(vcs, msg, mq, merge, parent=None)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.FilenameRole?7
 eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.StatusRole?7
 eric6.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.closeEvent?4(e)
@@ -6593,6 +6593,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.IgnoreFileName?7
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg._createStatusMonitorThread?5(interval, project)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.activeExtensionsChanged?7
+eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.canCommitMerge?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.canPull?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.canPush?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.clearStatusCache?4()
@@ -6603,6 +6604,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.getHgSubPath?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.getPlugin?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hasSubrepositories?4()
+eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgAbortMerge?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgAddSubrepository?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgAnnotate?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgArchive?4()
@@ -6618,7 +6620,6 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBookmarkRename?4(name, renameInfo=None)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBranch?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBundle?4(name, bundleData=None)
-eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCancelMerge?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgConflicts?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCopy?4(name, project)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCreateIgnoreFile?4(name, autoAdd=False)
@@ -6672,7 +6673,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCheckout?4(vcsDataDict, projectDir, noDialog=False)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCleanup?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCommandLine?4(name)
-eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCommit?4(name, message, noDialog=False, closeBranch=False, mq=False)
+eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsCommit?4(name, message, noDialog=False, closeBranch=False, mq=False, merge=False)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsConvertProject?4(vcsDataDict, project)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsDiff?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.hg.Hg.vcsExists?4()