Mercurial Repositories > eric / file diff

diff -r de889f485ae8 -r 194a055fff04 Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Mon May 28 13:51:35 2012 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Mon May 28 15:59:36 2012 +0200
@@ -241,6 +241,7 @@
         act = menu.addAction(UI.PixmapCache.getIcon("vcsRevert.png"),
             self.trUtf8('Revert changes'), self.__HgRevert)
         self.vcsMenuActions.append(act)
+        # TODO: rename to "Conflict resolved (and subsequent occurrances)"
         act = menu.addAction(self.trUtf8('Resolve conflict'), self.__HgResolve)
         self.vcsMenuActions.append(act)
         menu.addSeparator()