--- 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.