src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html

branch
eric7
changeset 10438
4cd7e5a8b3cf
parent 9209
b99e7fd55fd3
child 10479
856476537696
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html	Fri Dec 22 19:45:17 2023 +0100
+++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html	Sat Dec 23 15:40:23 2023 +0100
@@ -90,27 +90,25 @@
 </p>
 <dl>
 
-<dt><i>mergelist1</i></dt>
+<dt><i>mergelist1</i> (list of str)</dt>
 <dd>
 list of previously entered URLs/revisions
-            (list of strings)
 </dd>
-<dt><i>mergelist2</i></dt>
+<dt><i>mergelist2</i> (list of str)</dt>
 <dd>
 list of previously entered URLs/revisions
-            (list of strings)
 </dd>
-<dt><i>targetlist</i></dt>
+<dt><i>targetlist</i> (list of str)</dt>
 <dd>
-list of previously entered targets (list of strings)
+list of previously entered targets
 </dd>
-<dt><i>force</i></dt>
+<dt><i>force</i> (bool)</dt>
 <dd>
-flag indicating a forced merge (boolean)
+flag indicating a forced merge
 </dd>
-<dt><i>parent</i></dt>
+<dt><i>parent</i> (QWidget)</dt>
 <dd>
-parent widget (QWidget)
+parent widget
 </dd>
 </dl>
 <a NAME="SvnMergeDialog.__enableOkButton" ID="SvnMergeDialog.__enableOkButton"></a>
@@ -131,7 +129,13 @@
 <dt>Return:</dt>
 <dd>
 tuple naming two tag names or two revisions, a target and
-            a flag indicating a forced merge (string, string, string, boolean)
+            a flag indicating a forced merge
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (str, str, str, bool)
 </dd>
 </dl>
 <a NAME="SvnMergeDialog.on_tag1Combo_editTextChanged" ID="SvnMergeDialog.on_tag1Combo_editTextChanged"></a>
@@ -143,9 +147,9 @@
 </p>
 <dl>
 
-<dt><i>text</i></dt>
+<dt><i>text</i> (str)</dt>
 <dd>
-text of the combo (string)
+text of the combo
 </dd>
 </dl>
 <a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a>
@@ -157,9 +161,9 @@
 </p>
 <dl>
 
-<dt><i>text</i></dt>
+<dt><i>text</i> (str)</dt>
 <dd>
-text of the combo (string)
+text of the combo
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>

eric ide

mercurial