Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/vscode.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/extensions/merge-conflict
AgeCommit message (Expand)Author
2018-07-30Settings sweep (#54690)Alex Dima
2018-07-14Edit pass on new built-in extension comments (#54277)Greg Van Liew
2018-07-12Standardize readme across built-in extensions #54098Ramya Achutha Rao
2018-07-03Move to latest vscode-nls for corrupted cache supportDirk Baeumer
2018-03-02Add link to documentation (#43978)Christof Marti
2018-03-02Edit pass on built-in extension descriptions (#44875)Greg Van Liew
2018-02-27Bump version (#43978)Christof Marti
2018-02-26Name, description, icon for merge-conflict extension (#43978)Christof Marti
2018-02-24Use latest version of telemetry moduleRamya Achutha Rao
2018-02-18Update telemetry moduleRamya Achutha Rao
2018-02-14Update telemetry module to fix issue of missing version in eventsRamya Achutha Rao
2018-02-09Update extensions for TS 2.7Matt Bierner
2018-01-30Upgrade to latest language pack formatDirk Baeumer
2018-01-30Update the telemetry module used by extensionsRamya Achutha Rao
2018-01-25Add support for Language PacksDirk Baeumer
2018-01-16Add alias for commands (#39778)Christof Marti
2018-01-10Register content provider (again) (fixes #40557)Christof Marti
2018-01-08Fix typo in MergeDecorator class nameSergey Kintsel
2017-11-28Adds "Accept All Current" to command paletteJoe Martella
2017-11-14yarn: replace most shrinkwrap filesJoao Moreno
2017-11-07Add additional no unused checks for merge-conflict extensionMatt Bierner
2017-11-07tslint5 adoption - fix semicolon ruleErich Gamma
2017-11-06Enable strict in a few more extensionsMatt Bierner
2017-10-09Use strict versions for @types. Fixes #35561Matt Bierner
2017-08-31Only register for file: and untitled: (fixes #33133)Christof Marti
2017-08-28Merge pull request #31253 from yfdyh000/i18n-fixesMartin Aeschlimann
2017-08-09Spelling fixest-amqi
2017-07-22Fixes some extensions strings missing for i18nYFdyh000
2017-06-30remove dev dependencies from shrinkwrapkieferrm
2017-06-30add shrinkwrap file for merge-conflictkieferrm
2017-06-30update dependency on vscode-extension-telemetrykieferrm
2017-06-29Use original scheme (fixes #29872)Christof Marti
2017-06-28Import 'nls' in extensions entry point. Fixes #29098.Michel Kaporin
2017-06-26Remove merge keyboard shortcuts (fixes #28376)Christof Marti
2017-06-26Fix background decorations (fixes #28368)Christof Marti
2017-06-26Support GNU patch --merge results (fixes #28360)Christof Marti
2017-06-21use vsce to determine what to package when bundling extensionsJoao Moreno
2017-06-21Remove unnecessary dependenciesChristof Marti
2017-06-20Register regular commands and look up active editor (fixes #27584, fixes #27585)Christof Marti
2017-06-13Workbench colors (#28507)Christof Marti
2017-06-13Handle diff3-style merge correctly (#27405)Kate Miháliková
2017-06-03Title case (#27569)Christof Marti
2017-06-01Use outlines in high contrast (#27580)Christof Marti
2017-05-31Make sure we don't apply decorations to disposed editorsChristof Marti
2017-05-31Make sure we decorate all visible editors (fixes #27574)Christof Marti
2017-05-31CommentChristof Marti
2017-05-31Track pending updates per editor (fixes #27570)Christof Marti
2017-05-31Title case (fixes #27569)Christof Marti
2017-05-31Title case (fixes #27569)Christof Marti
2017-05-31Remove extra package.json (fixes #27754)Christof Marti
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-09 15:09:24 +0300