diff -r 4786fd10108b -r 5829d2580f65 Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Sat Nov 01 19:26:28 2014 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.hg.html Sat Nov 01 19:30:28 2014 +0100
@@ -177,7 +177,7 @@
<td>Public method to cancel an uncommitted merge.</td>
</tr><tr>
<td><a href="#Hg.hgConflicts">hgConflicts</a></td>
-<td>Public method used to show a list of files containing.</td>
+<td>Public method used to show a list of files containing conflicts.</td>
</tr><tr>
<td><a href="#Hg.hgCopy">hgCopy</a></td>
<td>Public method used to copy a file/directory.</td>
@@ -276,7 +276,7 @@
<td>Public method used to serve the project.</td>
</tr><tr>
<td><a href="#Hg.hgShowBranch">hgShowBranch</a></td>
-<td>Public method used to show the current branch the working directory.</td>
+<td>Public method used to show the current branch of the working directory.</td>
</tr><tr>
<td><a href="#Hg.hgShowConfig">hgShowConfig</a></td>
<td>Public method to show the combined configuration.</td>
@@ -789,7 +789,7 @@
<h4>Hg.hgConflicts</h4>
<b>hgConflicts</b>(<i>name</i>)
<p>
- Public method used to show a list of files containing.
+ Public method used to show a list of files containing conflicts.
</p><dl>
<dt><i>name</i></dt>
<dd>
@@ -1248,7 +1248,7 @@
<h4>Hg.hgShowBranch</h4>
<b>hgShowBranch</b>(<i>name</i>)
<p>
- Public method used to show the current branch the working directory.
+ Public method used to show the current branch of the working directory.
</p><dl>
<dt><i>name</i></dt>
<dd>
