Mercurial Repositories > eric / file diff

--- a/APIs/Python3/eric5.api	Sat May 17 16:53:00 2014 +0200
+++ b/APIs/Python3/eric5.api	Sat May 17 18:18:06 2014 +0200
@@ -4558,6 +4558,23 @@
 eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.rejected?7
 eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.showEvent?4(evt)
 eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog?1(vcs, msg, mq, parent=None)
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.StatusRole?7
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.closeEvent?4(e)
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.keyPressEvent?4(evt)
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_buttonBox_clicked?4(button)
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_conflictsList_itemDoubleClicked?4(item, column)
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_conflictsList_itemSelectionChanged?4()
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_editButton_clicked?4()
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_input_returnPressed?4()
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_passwordCheckBox_toggled?4(isOn)
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_reMergeButton_clicked?4()
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_refreshButton_clicked?4()
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_resolvedButton_clicked?4()
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_sendButton_clicked?4()
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.on_unresolvedButton_clicked?4()
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.show?4()
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.start?4(path)
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog?1(vcs, parent=None)
 eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.getData?4()
 eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.on_dirButton_clicked?4()
 eric5.Plugins.VcsPlugins.vcsMercurial.HgCopyDialog.HgCopyDialog.on_targetEdit_textChanged?4(txt)
@@ -5032,6 +5049,7 @@
 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBranch?4(name)
 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgBundle?4(name)
 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCancelMerge?4(name)
+eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgConflicts?4(name)
 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCopy?4(name, project)
 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgCreateIgnoreFile?4(name, autoAdd=False)
 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgEditConfig?4(name, withLargefiles=True, largefilesData=None)
@@ -5056,9 +5074,10 @@
 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPreviewBundle?4(name)
 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPull?4(name)
 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgPush?4(name, force=False, newBranch=False)
+eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgReMerge?4(name)
 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRecover?4(name)
 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRemoveSubrepositories?4()
-eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgResolve?4(name)
+eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgResolved?4(name, unresolve=False)
 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRevert?4(name)
 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgRollback?4(name)
 eric5.Plugins.VcsPlugins.vcsMercurial.hg.Hg.hgSbsDiff?4(name, extended=False, revisions=None)