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

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

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

Visibility: public

Requested revision: 98b8008bcc071fce23fa71dd05e48dde8420aca3

Requested commit: 98b8008bcc071fce23fa71dd05e48dde8420aca3

Commit: 98b8008bcc071fce23fa71dd05e48dde8420aca3

Tree: 4040c2dc9ebe3129078e001474f4a6be1d8ce483

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

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

```

## Parents

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

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

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