Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py
- changeset 172
- 4d421fed3b64
- parent 13
- 1af94a91f439
- child 791
- 9ec2ac20e54e
equal
deleted
inserted
replaced
| 171:0bb5b5e2e219 | 172:4d421fed3b64 |
|---|---|
| 72 """ | 72 """ |
| 73 self.__enableOkButton() | 73 self.__enableOkButton() |
| 74 | 74 |
| 75 def getParameters(self): | 75 def getParameters(self): |
| 76 """ | 76 """ |
| 77 Public method to retrieve the tag data. | 77 Public method to retrieve the merge data. |
| 78 | 78 |
| 79 @return tuple naming two tag names or two revisions, a target and | 79 @return tuple naming two tag names or two revisions, a target and |
| 80 a flag indicating a forced merge (string, string, string, boolean) | 80 a flag indicating a forced merge (string, string, string, boolean) |
| 81 """ | 81 """ |
| 82 return (self.tag1Combo.currentText(), | 82 return (self.tag1Combo.currentText(), |
