%PDF-1.5 %���� ºaâÚÎΞ-ÌE1ÍØÄ÷{òò2ÿ ÛÖ^ÔÀá TÎ{¦?§®¥kuµùÕ5sLOšuY
| Server IP : 122.154.253.140 / Your IP : 216.73.216.34 Web Server : Microsoft-IIS/7.5 System : Windows NT SERVER02 6.1 build 7601 (Windows Server 2008 R2 Standard Edition Service Pack 1) i586 User : IUSR ( 0) PHP Version : 5.6.31 Disable Function : NONE MySQL : ON | cURL : ON | WGET : OFF | Perl : OFF | Python : OFF | Sudo : OFF | Pkexec : OFF Directory : C:/Program Files/Microsoft VS Code/resources/app/extensions/merge-conflict/ |
Upload File : |
{
"displayName": "Merge Conflict",
"description": "Highlighting and commands for inline merge conflicts.",
"command.category": "Merge Conflict",
"command.accept.all-current": "Accept All Current",
"command.accept.all-incoming": "Accept All Incoming",
"command.accept.all-both": "Accept All Both",
"command.accept.current": "Accept Current",
"command.accept.incoming": "Accept Incoming",
"command.accept.selection": "Accept Selection",
"command.accept.both": "Accept Both",
"command.next": "Next Conflict",
"command.previous": "Previous Conflict",
"command.compare": "Compare Current Conflict",
"config.title": "Merge Conflict",
"config.codeLensEnabled": "Enable/disable merge conflict block CodeLens within editor",
"config.decoratorsEnabled": "Enable/disable merge conflict decorators within editor"
}