Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric5.VCS.StatusMonitorThread.html
Documentation/Source/eric5.VCS.StatusMonitorThread.html
- changeset 217
- 8ce554fb0bee
- parent 110
- c9a969db1469
- child 249
- 52df4455a035
equal
deleted
inserted
replaced
| 216:6f9713e8d570 | 217:8ce554fb0bee |
|---|---|
| 125 path relative to the project directory starting with the third column. | 125 path relative to the project directory starting with the third column. |
| 126 The allowed status flags are: | 126 The allowed status flags are: |
| 127 <ul> | 127 <ul> |
| 128 <li>"A" path was added but not yet comitted</li> | 128 <li>"A" path was added but not yet comitted</li> |
| 129 <li>"M" path has local changes</li> | 129 <li>"M" path has local changes</li> |
| 130 <li>"O" path was removed</li> | |
| 130 <li>"R" path was deleted and then re-added</li> | 131 <li>"R" path was deleted and then re-added</li> |
| 131 <li>"U" path needs an update</li> | 132 <li>"U" path needs an update</li> |
| 132 <li>"Z" path contains a conflict</li> | 133 <li>"Z" path contains a conflict</li> |
| 133 <li>" " path is back at normal</li> | 134 <li>" " path is back at normal</li> |
| 134 </ul> | 135 </ul> |
