# Merge remote-tracking branch 'origin/main' into fewer-context-traits · gitcafe/zed

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

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

Visibility: public

Requested revision: 7ca412ade3af7cceda972034d0910fe9eb34e597

Requested commit: 7ca412ade3af7cceda972034d0910fe9eb34e597

Commit: 7ca412ade3af7cceda972034d0910fe9eb34e597

Tree: 89c4e7fc8c7db13207cb3bcbc570877c4a968f58

Author: Antonio Scandurra

Committer: Antonio Scandurra

## Message

```
Merge remote-tracking branch 'origin/main' into fewer-context-traits

```

## Parents

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

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

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