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

branch
eric7
changeset 10479
856476537696
parent 10438
4cd7e5a8b3cf
child 10690
fab36645aa7d
--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html	Thu Jan 04 17:16:15 2024 +0100
+++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html	Thu Jan 04 18:02:25 2024 +0100
@@ -7,53 +7,50 @@
 <body>
 <a NAME="top" ID="top"></a>
 <h1>eric7.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog</h1>
-
 <p>
 Module implementing a dialog to enter the data for a merge operation.
 </p>
+
 <h3>Global Attributes</h3>
-
 <table>
 <tr><td>None</td></tr>
 </table>
+
 <h3>Classes</h3>
-
 <table>
-
 <tr>
 <td><a href="#SvnMergeDialog">SvnMergeDialog</a></td>
 <td>Class implementing a dialog to enter the data for a merge operation.</td>
 </tr>
 </table>
+
 <h3>Functions</h3>
-
 <table>
 <tr><td>None</td></tr>
 </table>
+
 <hr />
 <hr />
 <a NAME="SvnMergeDialog" ID="SvnMergeDialog"></a>
 <h2>SvnMergeDialog</h2>
-
 <p>
     Class implementing a dialog to enter the data for a merge operation.
 </p>
+
 <h3>Derived from</h3>
 QDialog, Ui_SvnMergeDialog
 <h3>Class Attributes</h3>
-
 <table>
 <tr><td>None</td></tr>
 </table>
+
 <h3>Class Methods</h3>
-
 <table>
 <tr><td>None</td></tr>
 </table>
+
 <h3>Methods</h3>
-
 <table>
-
 <tr>
 <td><a href="#SvnMergeDialog.__init__">SvnMergeDialog</a></td>
 <td>Constructor</td>
@@ -75,19 +72,20 @@
 <td>Private slot to handle the tag2Combo editTextChanged signal.</td>
 </tr>
 </table>
+
 <h3>Static Methods</h3>
-
 <table>
 <tr><td>None</td></tr>
 </table>
 
+
 <a NAME="SvnMergeDialog.__init__" ID="SvnMergeDialog.__init__"></a>
 <h4>SvnMergeDialog (Constructor)</h4>
 <b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force=False, parent=None</i>)
-
 <p>
         Constructor
 </p>
+
 <dl>
 
 <dt><i>mergelist1</i> (list of str)</dt>
@@ -114,17 +112,17 @@
 <a NAME="SvnMergeDialog.__enableOkButton" ID="SvnMergeDialog.__enableOkButton"></a>
 <h4>SvnMergeDialog.__enableOkButton</h4>
 <b>__enableOkButton</b>(<i></i>)
-
 <p>
         Private method used to enable/disable the OK-button.
 </p>
+
 <a NAME="SvnMergeDialog.getParameters" ID="SvnMergeDialog.getParameters"></a>
 <h4>SvnMergeDialog.getParameters</h4>
 <b>getParameters</b>(<i></i>)
-
 <p>
         Public method to retrieve the merge data.
 </p>
+
 <dl>
 <dt>Return:</dt>
 <dd>
@@ -141,10 +139,10 @@
 <a NAME="SvnMergeDialog.on_tag1Combo_editTextChanged" ID="SvnMergeDialog.on_tag1Combo_editTextChanged"></a>
 <h4>SvnMergeDialog.on_tag1Combo_editTextChanged</h4>
 <b>on_tag1Combo_editTextChanged</b>(<i>text</i>)
-
 <p>
         Private slot to handle the tag1Combo editTextChanged signal.
 </p>
+
 <dl>
 
 <dt><i>text</i> (str)</dt>
@@ -155,10 +153,10 @@
 <a NAME="SvnMergeDialog.on_tag2Combo_editTextChanged" ID="SvnMergeDialog.on_tag2Combo_editTextChanged"></a>
 <h4>SvnMergeDialog.on_tag2Combo_editTextChanged</h4>
 <b>on_tag2Combo_editTextChanged</b>(<i>text</i>)
-
 <p>
         Private slot to handle the tag2Combo editTextChanged signal.
 </p>
+
 <dl>
 
 <dt><i>text</i> (str)</dt>
@@ -168,4 +166,4 @@
 </dl>
 <div align="right"><a href="#top">Up</a></div>
 <hr />
-</body></html>
\ No newline at end of file
+</body></html>

eric ide

mercurial