# Merge branch 'main' into vim-search · gitcafe/zed

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

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

Visibility: public

Requested revision: f887a17ffea24d64f2e2af4b7c4add3761b01ff9

Requested commit: f887a17ffea24d64f2e2af4b7c4add3761b01ff9

Commit: f887a17ffea24d64f2e2af4b7c4add3761b01ff9

Tree: 982c5e69340f77eb87d49addc3dc7b54444ae100

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into vim-search

```

## Parents

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

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

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