Merge commit 'refs/pull/47890/head' of github.com:Microsoft/vscode into pr/47890

This commit is contained in:
Joao Moreno
2018-07-06 15:07:20 +02:00
3 changed files with 13 additions and 1 deletions

View File

@@ -74,10 +74,11 @@
"colors.added": "Color for added resources.",
"config.detectSubmodulesLimit": "Controls the limit of git submodules detected.",
"config.alwaysSignOff": "Controls the signoff flag for all commits",
"config.ignoredRepositories": "List of git repositories to ignore",
"colors.modified": "Color for modified resources.",
"colors.deleted": "Color for deleted resources.",
"colors.untracked": "Color for untracked resources.",
"colors.ignored": "Color for ignored resources.",
"colors.conflict": "Color for resources with conflicts.",
"colors.submodule": "Color for submodule resources."
}
}