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

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

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

Visibility: public

Requested revision: aa7b65bbaf07e2807cc9cc2151470d2f952d5334

Requested commit: aa7b65bbaf07e2807cc9cc2151470d2f952d5334

Commit: aa7b65bbaf07e2807cc9cc2151470d2f952d5334

Tree: a035321738e80b8547dd517ce558981a7ed8e96c

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into vim-softwrap-word

```

## Parents

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

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

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