# Merge branch 'main' into vim2 · gitcafe/zed

[View on GitCafe](https://git.cafe/gitcafe/zed/commit/b66b4915cf838d657ce9db75b1bc52727a6b9b0a)

Repository: [gitcafe/zed](https://git.cafe/gitcafe/zed)

Visibility: public

Requested revision: b66b4915cf838d657ce9db75b1bc52727a6b9b0a

Requested commit: b66b4915cf838d657ce9db75b1bc52727a6b9b0a

Commit: b66b4915cf838d657ce9db75b1bc52727a6b9b0a

Tree: 05e21b8cf4c287dfa3cae2e468ccf8ca387cb86e

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into vim2

```

## Parents

- [a4ea7bf92867b3502c5fb6f56c9f36c76f8da20c](https://git.cafe/gitcafe/zed/commit/a4ea7bf92867b3502c5fb6f56c9f36c76f8da20c?format=markdown)

- [bc130fd6b031404ef8fceaed1e4f236ec1d3255c](https://git.cafe/gitcafe/zed/commit/bc130fd6b031404ef8fceaed1e4f236ec1d3255c?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zed/tree/b66b4915cf838d657ce9db75b1bc52727a6b9b0a?format=markdown)