Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 03:29:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

#100346 fix opening diffs and accept preview

Browse Source
This commit is contained in:
Sandeep Somavarapu
2020-07-16 17:36:40 +02:00
parent 28f3fa9e9b
commit fdf70cbc7b
13 changed files with 240 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/workbench/services/userDataSync/common/userDataSync.ts
View File

@@ -33,7 +33,8 @@ export interface IUserDataSyncResource {
readonly syncResource: SyncResource;
readonly local: URI;
readonly remote: URI;
readonly preview: URI;
readonly merged: URI;
readonly accepted: URI;
readonly localChange: Change;
readonly remoteChange: Change;
readonly mergeState: MergeState;