Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Mon May 28 13:51:35 2012 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Mon May 28 15:59:36 2012 +0200
@@ -275,6 +275,7 @@
         act = menu.addAction(UI.PixmapCache.getIcon("vcsMerge.png"),
             self.trUtf8('Merge changes'), self._VCSMerge)
         self.vcsMenuActions.append(act)
+        # TODO: rename to "Conflict resolved (and subsequent occurrances)"
         act = menu.addAction(self.trUtf8('Resolve conflict'), self.__SVNResolve)
         self.vcsMenuActions.append(act)
         menu.addSeparator()