eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html

branch
maintenance
changeset 8043
0acf98cd089a
parent 7989
a21d673a8f99
diff -r 866adc8c315b -r 0acf98cd089a eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html	Sun Jan 17 13:53:08 2021 +0100
+++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html	Mon Feb 01 10:38:16 2021 +0100
@@ -188,7 +188,7 @@
         Public method to retrieve the merge data.
 </p>
 <dl>
-<dt>Returns:</dt>
+<dt>Return:</dt>
 <dd>
 tuple naming the revision, a flag indicating that the merge
             shall be committed, the commit message, a flag indicating that a

eric ide

mercurial