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
2022-01-19Fix addOrigin (fixes #140551)Christof Marti
2021-11-09use tsconfig.json#include for vscode.d.ts and vscode.proposed.d.ts, enables t...Johannes Rieken
2021-11-09move vscode.d.ts and vscode.proposed.d.ts into `src/vscode-dts`-folder, https...Johannes Rieken
2021-07-08adopt web extensions to webpack 5Martin Aeschlimann
2021-05-04chore: bump node@14.x in devDependencies (#122905)Robo
2021-04-22adopt virtual workspaces - not supportedSandeep Somavarapu
2021-04-22Merge branch 'main' into capabilitiesSandeep Somavarapu
2021-04-22Adds code lens on vfs filesEric Amodio
2021-04-21update ext manifest schema validation and built-in extsSteVen Batten
2021-04-20Add icons for built-in extensions (fixes #81760)Miguel Solorio
2021-04-13Adopt workspaceTrustChristof Marti
2021-04-13Use more standard name for shared extension tsconfigMatt Bierner
2021-03-31Add next/prev conflicts (#97613)Christof Marti
2021-03-31Add next/prev conflicts (#97613)Wenlu Wang
2021-02-09Only match exactly 7 equals (fixes #95040)Alexandre Schnegg
2021-01-29add repository field to extensions package.jsonJoão Moreno
2021-01-12Activate onStartupFinished (#110031)Christof Marti
2020-12-18Align `@types/*` dev dependencies (#112718)Alexandru Dima
2020-09-16Update to use TS 4.1 for building VS CodeMatt Bierner
2020-07-24Do not ship unnecessary files with extensionsAlex Dima
2020-06-26fix merge-conflict browser mainMartin Aeschlimann
2020-06-26fix merge-conflict for browserMartin Aeschlimann
2020-06-26used shared webpack-config for browserMartin Aeschlimann
2020-06-12make merge-conflic serverlessMartin Aeschlimann
2020-04-03CodeLens should be one wordGreg Van Liew
2020-03-27Remove delay (fixes #62652)Christof Marti
2019-11-27fix typo: consecutive-word duplicationsryenus
2019-10-28debt - bump node.d.ts dependency in extensions to 12.x (part of #82514)Benjamin Pasero
2019-09-20support merge code lens for vscode-userdataSandeep Somavarapu
2019-07-01Fix: Accept All Current/Incoming for multiple files (fixes #63621)Christof Marti
2019-06-06Add License field to package.jsons #68423 (#68771)Aurélien Pupier
2019-06-05update @types/node (#74881)Benjamin Pasero
2019-06-05debt - use @types/node: 10 for all extensionsBenjamin Pasero
2019-05-29Add enumDescriptions for merge-conflict.diffViewPositionMatt Bierner
2019-05-25Open the diff view in current editor, to the side or below.Peng Lyu
2019-05-25Open the new editor group belowPeng Lyu
2019-05-25Always compare change with context.Peng Lyu
2019-05-24Support open diff in new editor groupPeng Lyu
2019-05-24Show context for diff view of merge conflict and introduce compareAll.Peng Lyu
2019-01-23Remove pointless conjucntion in documentTrackeralexet
2019-01-04Second pass converting for index based looping to for-of loopsMatt Bierner
2019-01-04Replace some common index based for loops with `for-of` loopsMatt Bierner
2019-01-04Enable no-var-keyword tslint ruleMatt Bierner
2018-11-30Fix last merge conflict warningslaphets
2018-11-06[ImgBot] Optimize imagesImgBotApp
2018-10-03Remove duplicate blank lines at the start of some extension src filesMatt Bierner
2018-10-03Remove use strict in extensions (part 2)Matt Bierner
2018-10-02Update more extensions to use shared configMatt Bierner
2018-10-02Off by default (#45853)Christof Marti
2018-10-02Merge branch 'master' into Issue-#45853-checkedChristof Marti
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-31 08:58:36 +0300