| Server IP : www.kowitt.ac.th / Your IP : 216.73.216.118 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/out/ |
Upload File : |
{"mergeDecorator":{"messages":["(Current Change)","(Incoming Change)"],"keys":["currentChange","incomingChange"]},"commandHandler":{"messages":["Editor cursor is not within a merge conflict","{0}: Current Changes ⟷ Incoming Changes","Editor cursor is not within a merge conflict","Editor cursor is within the common ancestors block, please move it to either the \"current\" or \"incoming\" block","Editor cursor is within the merge conflict splitter, please move it to either the \"current\" or \"incoming\" block","No merge conflicts found in this file","No other merge conflicts within this file","Editor cursor is not within a merge conflict","No merge conflicts found in this file"],"keys":["cursorNotInConflict","compareChangesTitle","cursorNotInConflict","cursorOnCommonAncestorsRange","cursorOnSplitterRange","noConflicts","noOtherConflictsInThisFile","cursorNotInConflict","noConflicts"]},"codelensProvider":{"messages":["Accept Current Change","Accept Incoming Change","Accept Both Changes","Compare Changes"],"keys":["acceptCurrentChange","acceptIncomingChange","acceptBothChanges","compareChanges"]}}