eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html

branch
maintenance
changeset 8043
0acf98cd089a
parent 7989
a21d673a8f99
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html	Sun Jan 17 13:53:08 2021 +0100
+++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html	Mon Feb 01 10:38:16 2021 +0100
@@ -160,7 +160,7 @@
         Public method to retrieve the merge data.
 </p>
 <dl>
-<dt>Returns:</dt>
+<dt>Return:</dt>
 <dd>
 tuple naming the revision and a flag indicating a
             forced merge (string, boolean)

eric ide

mercurial