Mercurial Repositories > eric / file diff

--- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html	Fri Dec 22 19:45:17 2023 +0100
+++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html	Sat Dec 23 15:40:23 2023 +0100
@@ -130,25 +130,25 @@
 </p>
 <dl>
 
-<dt><i>tagsList</i></dt>
+<dt><i>tagsList</i> (list of str)</dt>
 <dd>
-list of tags (list of strings)
+list of tags
 </dd>
-<dt><i>branchesList</i></dt>
+<dt><i>branchesList</i> (list of str)</dt>
 <dd>
-list of branches (list of strings)
+list of branches
 </dd>
-<dt><i>currentBranch</i></dt>
+<dt><i>currentBranch</i> (str)</dt>
 <dd>
-name of the current branch (string)
+name of the current branch
 </dd>
-<dt><i>remoteBranchesList</i></dt>
+<dt><i>remoteBranchesList</i> (list of str)</dt>
 <dd>
-list of remote branches (list of strings)
+list of remote branches
 </dd>
-<dt><i>parent</i></dt>
+<dt><i>parent</i> (QWidget)</dt>
 <dd>
-reference to the parent widget (QWidget)
+reference to the parent widget
 </dd>
 </dl>
 <a NAME="GitMergeDialog.__generateDefaultCommitMessage" ID="GitMergeDialog.__generateDefaultCommitMessage"></a>
@@ -179,8 +179,13 @@
 tuple naming the revision, a flag indicating that the merge
             shall be committed, the commit message, a flag indicating that a
             log summary shall be appended and a flag indicating to show diff
-            statistics at the end of the merge (string, boolean, string,
-            boolean, boolean)
+            statistics at the end of the merge
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (str, bool, str, bool, bool)
 </dd>
 </dl>
 <a NAME="GitMergeDialog.on_branchButton_toggled" ID="GitMergeDialog.on_branchButton_toggled"></a>
@@ -192,9 +197,9 @@
 </p>
 <dl>
 
-<dt><i>checked</i></dt>
+<dt><i>checked</i> (bool)</dt>
 <dd>
-state of the button (boolean)
+state of the button
 </dd>
 </dl>
 <a NAME="GitMergeDialog.on_branchCombo_editTextChanged" ID="GitMergeDialog.on_branchCombo_editTextChanged"></a>
@@ -206,9 +211,9 @@
 </p>
 <dl>
 
-<dt><i>txt</i></dt>
+<dt><i>txt</i> (str)</dt>
 <dd>
-text of the combo (string)
+text of the combo
 </dd>
 </dl>
 <a NAME="GitMergeDialog.on_commitGroupBox_toggled" ID="GitMergeDialog.on_commitGroupBox_toggled"></a>
@@ -220,9 +225,9 @@
 </p>
 <dl>
 
-<dt><i>checked</i></dt>
+<dt><i>checked</i> (bool)</dt>
 <dd>
-state of the group (boolean)
+state of the group
 </dd>
 </dl>
 <a NAME="GitMergeDialog.on_commitMessageEdit_textChanged" ID="GitMergeDialog.on_commitMessageEdit_textChanged"></a>
@@ -241,9 +246,9 @@
 </p>
 <dl>
 
-<dt><i>checked</i></dt>
+<dt><i>checked</i> (bool)</dt>
 <dd>
-state of the button (boolean)
+state of the button
 </dd>
 </dl>
 <a NAME="GitMergeDialog.on_idEdit_textChanged" ID="GitMergeDialog.on_idEdit_textChanged"></a>
@@ -255,9 +260,9 @@
 </p>
 <dl>
 
-<dt><i>txt</i></dt>
+<dt><i>txt</i> (str)</dt>
 <dd>
-text of the edit (string)
+text of the edit
 </dd>
 </dl>
 <a NAME="GitMergeDialog.on_noneButton_toggled" ID="GitMergeDialog.on_noneButton_toggled"></a>
@@ -269,9 +274,9 @@
 </p>
 <dl>
 
-<dt><i>checked</i></dt>
+<dt><i>checked</i> (bool)</dt>
 <dd>
-state of the button (boolean)
+state of the button
 </dd>
 </dl>
 <a NAME="GitMergeDialog.on_remoteBranchButton_toggled" ID="GitMergeDialog.on_remoteBranchButton_toggled"></a>
@@ -283,9 +288,9 @@
 </p>
 <dl>
 
-<dt><i>checked</i></dt>
+<dt><i>checked</i> (bool)</dt>
 <dd>
-state of the button (boolean)
+state of the button
 </dd>
 </dl>
 <a NAME="GitMergeDialog.on_remoteBranchCombo_editTextChanged" ID="GitMergeDialog.on_remoteBranchCombo_editTextChanged"></a>
@@ -297,9 +302,9 @@
 </p>
 <dl>
 
-<dt><i>txt</i></dt>
+<dt><i>txt</i> (str)</dt>
 <dd>
-text of the combo (string)
+text of the combo
 </dd>
 </dl>
 <a NAME="GitMergeDialog.on_tagButton_toggled" ID="GitMergeDialog.on_tagButton_toggled"></a>
@@ -311,9 +316,9 @@
 </p>
 <dl>
 
-<dt><i>checked</i></dt>
+<dt><i>checked</i> (bool)</dt>
 <dd>
-state of the button (boolean)
+state of the button
 </dd>
 </dl>
 <a NAME="GitMergeDialog.on_tagCombo_editTextChanged" ID="GitMergeDialog.on_tagCombo_editTextChanged"></a>
@@ -325,9 +330,9 @@
 </p>
 <dl>
 
-<dt><i>txt</i></dt>
+<dt><i>txt</i> (str)</dt>
 <dd>
-text of the combo (string)
+text of the combo
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>