Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/hg.py
Plugins/VcsPlugins/vcsMercurial/hg.py
- changeset 3578
- e55d32585d08
- parent 3562
- ef3f13a2c599
- child 3586
- 6e3a6c5b58bf
equal
deleted
inserted
replaced
| 3576:83b535c23264 | 3578:e55d32585d08 |
|---|---|
| 2052 """</table></p>""") | 2052 """</table></p>""") |
| 2053 .format(author, cdate, ctime)) | 2053 .format(author, cdate, ctime)) |
| 2054 | 2054 |
| 2055 dlg = VcsRepositoryInfoDialog(None, "\n".join(info)) | 2055 dlg = VcsRepositoryInfoDialog(None, "\n".join(info)) |
| 2056 dlg.exec_() | 2056 dlg.exec_() |
| 2057 | 2057 |
| 2058 # TODO: Add support for hg resolve -l displaying a dialog like log | |
| 2058 def hgResolve(self, name): | 2059 def hgResolve(self, name): |
| 2059 """ | 2060 """ |
| 2060 Public method used to resolve conflicts of a file/directory. | 2061 Public method used to resolve conflicts of a file/directory. |
| 2061 | 2062 |
| 2062 @param name file/directory name to be resolved (string) | 2063 @param name file/directory name to be resolved (string) |
