diff -r 533226ce6c1e -r 852dc7d65ff0 Plugins/VcsPlugins/vcsMercurial/hg.py --- a/Plugins/VcsPlugins/vcsMercurial/hg.py Thu Apr 03 19:02:33 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Thu Apr 03 19:21:10 2014 +0200 @@ -2768,6 +2768,8 @@ if res: dia.exec_() + # TODO: add support for hg update --clean to revert a failed/aborted merge + def hgServe(self, name): """ Public method used to serve the project.