Skip to content

3 way merge for git#150391

Merged
hediet merged 39 commits intomainfrom
3wm
May 25, 2022
Merged

3 way merge for git#150391
hediet merged 39 commits intomainfrom
3wm

Conversation

@hediet
Copy link
Copy Markdown
Member

@hediet hediet commented May 25, 2022

This PR implements #37350 and #146091.

The code still has bugs and needs a proper refactoring. Also tests are missing.

jrieken and others added 30 commits May 9, 2022 14:09
…action with "outside", add `ICodeEditorViewOptions` and make yours/theirs readonly
…2`. This isn't wire up yet because it requires bigger changes in git-land
@hediet hediet requested a review from jrieken May 25, 2022 16:03
@vscodenpa vscodenpa added this to the May 2022 milestone May 25, 2022
# Conflicts:
#	build/lib/i18n.resources.json
}
}

export function n<TTag extends string>(tag: TTag): never;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

eventually move to dom.ts

@hediet hediet merged commit d979e95 into main May 25, 2022
@hediet hediet deleted the 3wm branch May 25, 2022 17:02
@github-actions github-actions bot locked and limited conversation to collaborators Jul 9, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants