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

detect conflict markers when staging

Browse Source 
fixes #33983
This commit is contained in:
Joao Moreno
2017-10-03 10:20:45 +02:00
parent 25a8ce901f
commit bcb3e0d00e
4 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/git/package.json
View File

@@ -806,6 +806,7 @@
}
},
"dependencies": {
"byline": "^5.0.0",
"iconv-lite": "0.4.15",
"vscode-extension-telemetry": "0.0.8",
"vscode-nls": "2.0.2"