# Merge remote-tracking branch 'origin/main' into vim-indent · gitcafe/zed

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

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

Visibility: public

Requested revision: 29b2639b4c70c1671d0958bef35e39c3802112b9

Requested commit: 29b2639b4c70c1671d0958bef35e39c3802112b9

Commit: 29b2639b4c70c1671d0958bef35e39c3802112b9

Tree: 8ce0dc9cbc53d8fdedde68268833ed272e11595c

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Merge remote-tracking branch 'origin/main' into vim-indent

```

## Parents

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

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

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