# Merge branch 'main' into go-to-line2 · gitcafe/zed

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

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

Visibility: public

Requested revision: cbdd4aca8980495d3b8f12ef7e80d732cf0513e9

Requested commit: cbdd4aca8980495d3b8f12ef7e80d732cf0513e9

Commit: cbdd4aca8980495d3b8f12ef7e80d732cf0513e9

Tree: 8eecf87c811859664655e877769421136a70d873

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into go-to-line2

```

## Parents

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

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

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