Plugins/VcsPlugins/vcsMercurial/hg.py

changeset 3578
e55d32585d08
parent 3562
ef3f13a2c599
child 3586
6e3a6c5b58bf
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Thu May 15 18:45:07 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Thu May 15 18:50:44 2014 +0200
@@ -2054,7 +2054,8 @@
             
             dlg = VcsRepositoryInfoDialog(None, "\n".join(info))
             dlg.exec_()
-
+    
+    # TODO: Add support for hg resolve -l displaying a dialog like log
     def hgResolve(self, name):
         """
         Public method used to resolve conflicts of a file/directory.

eric ide

mercurial