# Merge pull request \#1529 from zed-industries/undo-divergence · gitcafe/zed

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

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

Visibility: public

Requested revision: eddab33b1690585b90fb2c416a2e0b387b3fc6d2

Requested commit: eddab33b1690585b90fb2c416a2e0b387b3fc6d2

Commit: eddab33b1690585b90fb2c416a2e0b387b3fc6d2

Tree: 786be7aedc56f56b51574aec989912e21e3aca8a

Author: Antonio Scandurra

Committer: GitHub

## Message

```
Merge pull request #1529 from zed-industries/undo-divergence

Fix divergence bug in undo/redo
```

## Parents

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

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

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