Merge from vscode e3c4990c67c40213af168300d1cfeb71d680f877 (#16569)

extensions/git/package.json

@@ -2196,6 +2196,24 @@
           "highContrast": "#A7A8A9"
         }
       },
+      {
+        "id": "gitDecoration.stageModifiedResourceForeground",
+        "description": "%colors.stageModified%",
+        "defaults": {
+          "light": "#895503",
+          "dark": "#E2C08D",
+          "highContrast": "#E2C08D"
+        }
+      },
+      {
+        "id": "gitDecoration.stageDeletedResourceForeground",
+        "description": "%colors.stageDeleted%",
+        "defaults": {
+          "light": "#ad0707",
+          "dark": "#c74e39",
+          "highContrast": "#c74e39"
+        }
+      },
       {
         "id": "gitDecoration.conflictingResourceForeground",
         "description": "%colors.conflict%",
@@ -2366,11 +2384,12 @@
   "devDependencies": {
     "@types/byline": "4.2.31",
     "@types/file-type": "^5.2.1",
-    "@types/mocha": "2.2.43",
-    "@types/node": "^12.12.31",
-    "@types/which": "^1.0.28",
-    "mocha": "^3.2.0",
-    "mocha-junit-reporter": "^1.23.3",
-    "mocha-multi-reporters": "^1.1.7"
+    "@types/mocha": "^8.2.0",
+    "@types/node": "14.x",
+    "@types/which": "^1.0.28"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/microsoft/vscode.git"
   }
 }