Mercurial Repositories > eric / file comparison
comparison: eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.html
eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitStatusMonitorThread.html
- branch
- maintenance
- changeset 8043
- 0acf98cd089a
- parent 7989
- a21d673a8f99
equal
deleted
inserted
replaced
| 7991:866adc8c315b | 8043:0acf98cd089a |
|---|---|
| 127 <p> | 127 <p> |
| 128 This method should be overridden and create a short info message to be | 128 This method should be overridden and create a short info message to be |
| 129 shown in the main window status bar right next to the status indicator. | 129 shown in the main window status bar right next to the status indicator. |
| 130 </p> | 130 </p> |
| 131 <dl> | 131 <dl> |
| 132 <dt>Returns:</dt> | 132 <dt>Return:</dt> |
| 133 <dd> | 133 <dd> |
| 134 short info message | 134 short info message |
| 135 </dd> | 135 </dd> |
| 136 </dl> | 136 </dl> |
| 137 <dl> | 137 <dl> |
| 161 <li>"Z" path contains a conflict</li> | 161 <li>"Z" path contains a conflict</li> |
| 162 <li>" " path is back at normal</li> | 162 <li>" " path is back at normal</li> |
| 163 </ul> | 163 </ul> |
| 164 </p> | 164 </p> |
| 165 <dl> | 165 <dl> |
| 166 <dt>Returns:</dt> | 166 <dt>Return:</dt> |
| 167 <dd> | 167 <dd> |
| 168 tuple of flag indicating successful operation (boolean) and | 168 tuple of flag indicating successful operation (boolean) and |
| 169 a status message in case of non successful operation (string) | 169 a status message in case of non successful operation (string) |
| 170 </dd> | 170 </dd> |
| 171 </dl> | 171 </dl> |
