Mercurial Repositories > eric / file diff

--- a/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html	Mon Apr 12 17:45:51 2010 +0000
+++ b/Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html	Mon Apr 12 18:00:42 2010 +0000
@@ -61,7 +61,7 @@
 <td>Private method used to enable/disable the OK-button.</td>
 </tr><tr>
 <td><a href="#SvnMergeDialog.getParameters">getParameters</a></td>
-<td>Public method to retrieve the tag data.</td>
+<td>Public method to retrieve the merge data.</td>
 </tr><tr>
 <td><a href="#SvnMergeDialog.on_tag1Combo_editTextChanged">on_tag1Combo_editTextChanged</a></td>
 <td>Private slot to handle the tag1Combo editTextChanged signal.</td>
@@ -106,7 +106,7 @@
 <h4>SvnMergeDialog.getParameters</h4>
 <b>getParameters</b>(<i></i>)
 <p>
-        Public method to retrieve the tag data.
+        Public method to retrieve the merge data.
 </p><dl>
 <dt>Returns:</dt>
 <dd>