Mercurial Repositories > eric / file diff

--- a/src/eric7/Documentation/Source/eric7.VCS.VersionControl.html	Sat Apr 20 18:01:36 2024 +0200
+++ b/src/eric7/Documentation/Source/eric7.VCS.VersionControl.html	Sat Apr 20 18:02:35 2024 +0200
@@ -476,11 +476,11 @@
 
 <dt><i>interval</i> (int)</dt>
 <dd>
-check interval for the monitor thread in seconds
+check interval for the monitor thread in seconds (unused)
 </dd>
 <dt><i>project</i> (Project)</dt>
 <dd>
-reference to the project object
+reference to the project object (unused)
 </dd>
 </dl>
 <dl>
@@ -1768,16 +1768,16 @@
 </dl>
 <a NAME="VersionControl.vcsResolved" ID="VersionControl.vcsResolved"></a>
 <h4>VersionControl.vcsResolved</h4>
-<b>vcsResolved</b>(<i>name</i>)
+<b>vcsResolved</b>(<i>_name</i>)
 <p>
         Public method used to resolve conflicts of a file/directory.
 </p>
 
 <dl>
 
-<dt><i>name</i> (str)</dt>
+<dt><i>_name</i> (str)</dt>
 <dd>
-file/directory name to be resolved
+file/directory name to be resolved (unused)
 </dd>
 </dl>
 <a NAME="VersionControl.vcsRevert" ID="VersionControl.vcsRevert"></a>