diff -r ec16b423f62d -r f0408b5c84e9 Plugins/VcsPlugins/vcsMercurial/hg.py
--- a/Plugins/VcsPlugins/vcsMercurial/hg.py Sun Oct 05 10:33:11 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py Sun Oct 05 17:09:03 2014 +0200
@@ -2115,7 +2115,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)
"""
@@ -2230,7 +2230,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)
"""
