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

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

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

Visibility: public

Requested revision: b3c64e47f1c8c627320f9f64a29de06f7945797b

Requested commit: b3c64e47f1c8c627320f9f64a29de06f7945797b

Commit: b3c64e47f1c8c627320f9f64a29de06f7945797b

Tree: 78ef1dbfb361d70727817518698c4f7e60c5cd05

Author: Max Brunsfeld

Committer: GitHub

## Message

```
Merge branch 'main' into cancel-buffer-search
```

## Parents

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

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

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