Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py
eric6/Plugins/VcsPlugins/vcsGit/GitMergeDialog.py
- branch
- maintenance
- changeset 8273
- 698ae46f40a4
- parent 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 8190:fb0ef164f536 | 8273:698ae46f40a4 |
|---|---|
| 26 @param branchesList list of branches (list of strings) | 26 @param branchesList list of branches (list of strings) |
| 27 @param currentBranch name of the current branch (string) | 27 @param currentBranch name of the current branch (string) |
| 28 @param remoteBranchesList list of remote branches (list of strings) | 28 @param remoteBranchesList list of remote branches (list of strings) |
| 29 @param parent reference to the parent widget (QWidget) | 29 @param parent reference to the parent widget (QWidget) |
| 30 """ | 30 """ |
| 31 super(GitMergeDialog, self).__init__(parent) | 31 super().__init__(parent) |
| 32 self.setupUi(self) | 32 self.setupUi(self) |
| 33 | 33 |
| 34 self.buttonBox.button( | 34 self.buttonBox.button( |
| 35 QDialogButtonBox.StandardButton.Ok).setEnabled(False) | 35 QDialogButtonBox.StandardButton.Ok).setEnabled(False) |
| 36 | 36 |
