Mercurial Repositories > eric / file diff

--- a/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html	Wed Sep 22 18:20:06 2021 +0200
+++ b/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsGit.GitStatusDialog.html	Wed Sep 22 19:52:28 2021 +0200
@@ -94,7 +94,7 @@
 </tr>
 <tr>
 <td><a href="#GitStatusDialog.__editConflict">__editConflict</a></td>
-<td>Private slot to handle the Edit file context menu entry.</td>
+<td>Private slot to handle the Edit Conflict context menu entry.</td>
 </tr>
 <tr>
 <td><a href="#GitStatusDialog.__finish">__finish</a></td>
@@ -194,7 +194,7 @@
 </tr>
 <tr>
 <td><a href="#GitStatusDialog.__sbsDiff">__sbsDiff</a></td>
-<td>Private slot to handle the Diff context menu entry.</td>
+<td>Private slot to handle the Side-By-Side Diff context menu entry.</td>
 </tr>
 <tr>
 <td><a href="#GitStatusDialog.__selectedLinesIndexes">__selectedLinesIndexes</a></td>
@@ -376,7 +376,7 @@
 <b>__editConflict</b>(<i></i>)
 
 <p>
-        Private slot to handle the Edit file context menu entry.
+        Private slot to handle the Edit Conflict context menu entry.
 </p>
 <a NAME="GitStatusDialog.__finish" ID="GitStatusDialog.__finish"></a>
 <h4>GitStatusDialog.__finish</h4>
@@ -640,7 +640,7 @@
 <b>__sbsDiff</b>(<i></i>)
 
 <p>
-        Private slot to handle the Diff context menu entry.
+        Private slot to handle the Side-By-Side Diff context menu entry.
 </p>
 <a NAME="GitStatusDialog.__selectedLinesIndexes" ID="GitStatusDialog.__selectedLinesIndexes"></a>
 <h4>GitStatusDialog.__selectedLinesIndexes</h4>