Mercurial Repositories > eric / changeset

--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Oct 05 10:34:00 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Sun Oct 05 17:09:03 2014 +0200
@@ -2114,7 +2114,7 @@
     
     def hgConflicts(self, name):
         """
-        Public method used to show a list of files containing.
+        Public method used to show a list of files containing conflicts.
         
         @param name file/directory name to be resolved (string)
         """
@@ -2229,7 +2229,7 @@
     
     def hgShowBranch(self, name):
         """
-        Public method used to show the current branch the working directory.
+        Public method used to show the current branch of the working directory.
         
         @param name file/directory name (string)
         """