diff -r f09a457c83fe -r 6e3a6c5b58bf APIs/Python3/eric5.bas --- a/APIs/Python3/eric5.bas Sat May 17 16:53:00 2014 +0200 +++ b/APIs/Python3/eric5.bas Sat May 17 18:18:06 2014 +0200 @@ -299,6 +299,7 @@ HgClientPromptDialog QDialog Ui_HgClientPromptDialog HgCommandDialog QDialog Ui_HgCommandDialog HgCommitDialog QWidget Ui_HgCommitDialog +HgConflictsListDialog QWidget Ui_HgConflictsListDialog HgCopyDialog QDialog Ui_HgCopyDialog HgDialog QDialog Ui_HgDialog HgDiffDialog QWidget Ui_HgDiffDialog