eae5d8c807
These conflicts will be resolved in the following commits. We do it this way so that PR review is possible. |
||
|---|---|---|
| .. | ||
| api | ||
| ipc | ||
| test | ||
| typings | ||
| askpass-empty.sh | ||
| askpass-main.ts | ||
| askpass.sh | ||
| askpass.ts | ||
| autofetch.ts | ||
| commands.ts | ||
| decorationProvider.ts | ||
| decorators.ts | ||
| emoji.ts | ||
| encoding.ts | ||
| fileSystemProvider.ts | ||
| git.ts | ||
| log.ts | ||
| main.ts | ||
| model.ts | ||
| protocolHandler.ts | ||
| pushError.ts | ||
| remoteProvider.ts | ||
| remoteSource.ts | ||
| repository.ts | ||
| staging.ts | ||
| statusbar.ts | ||
| terminal.ts | ||
| timelineProvider.ts | ||
| uri.ts | ||
| util.ts | ||
| watch.ts | ||