package.json 3.1 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25
{
  "name": "merge-conflict",
  "publisher": "vscode",
  "displayName": "merge-conflict",
  "description": "Merge Conflict",
  "version": "0.7.0",
  "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
  "enableProposedApi": true,
  "engines": {
    "vscode": "^1.5.0"
  },
  "categories": [
    "Other"
  ],
  "activationEvents": [
    "*"
  ],
  "main": "./out/extension",
  "scripts": {
    "compile": "gulp compile-extension:merge-conflict",
    "watch": "gulp watch-extension:merge-conflict"
  },
  "contributes": {
    "commands": [
      {
26 27
        "category": "%command.category%",
        "title": "%command.accept.all-incoming%",
28 29 30
        "command": "merge-conflict.accept.all-incoming"
      },
      {
31 32
        "category": "%command.category%",
        "title": "%command.accept.all-both%",
33 34 35
        "command": "merge-conflict.accept.all-both"
      },
      {
36 37
        "category": "%command.category%",
        "title": "%command.accept.current%",
38 39 40
        "command": "merge-conflict.accept.current"
      },
      {
41 42
        "category": "%command.category%",
        "title": "%command.accept.incoming%",
43 44 45
        "command": "merge-conflict.accept.incoming"
      },
      {
46
        "category": "%command.category%",
47 48 49 50
        "title": "Accept selection",
        "command": "merge-conflict.accept.selection"
      },
      {
51 52
        "category": "%command.category%",
        "title": "%command.accept.both%",
53 54 55
        "command": "merge-conflict.accept.both"
      },
      {
56 57
        "category": "%command.category%",
        "title": "%command.next%",
58 59 60
        "command": "merge-conflict.next"
      },
      {
61 62
        "category": "%command.category%",
        "title": "%command.previous%",
63 64 65
        "command": "merge-conflict.previous"
      },
      {
66 67
        "category": "%command.category%",
        "title": "%command.compare%",
68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123
        "command": "merge-conflict.compare"
      }
    ],
    "keybindings": [
      {
        "command": "merge-conflict.next",
        "when": "editorTextFocus",
        "key": "alt+m down"
      },
      {
        "command": "merge-conflict.previous",
        "when": "editorTextFocus",
        "key": "alt+m up"
      },
      {
        "command": "merge-conflict.accept.selection",
        "when": "editorTextFocus",
        "key": "alt+m enter"
      },
      {
        "command": "merge-conflict.accept.current",
        "when": "editorTextFocus",
        "key": "alt+m 1"
      },
      {
        "command": "merge-conflict.accept.incoming",
        "when": "editorTextFocus",
        "key": "alt+m 2"
      },
      {
        "command": "merge-conflict.accept.both",
        "when": "editorTextFocus",
        "key": "alt+m 3"
      }
    ],
    "configuration": {
      "title": "Merge Conflict",
      "properties": {
        "merge-conflict.enabled": {
          "type": "boolean",
          "description": "%config.enabled%",
          "default": true
        }
      }
    }
  },
  "dependencies": {
    "vscode-extension-telemetry": "^0.0.7",
    "vscode-nls": "^2.0.2"
  },
  "devDependencies": {
    "@types/mocha": "^2.2.41",
    "@types/node": "^7.0.4",
    "mocha": "^3.2.0"
  }
}