# ep: Add a prompt with git-style merge markers \(\#47215\) · gitcafe/zed

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

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

Visibility: public

Requested revision: 9a97c5c3dbbeac94865a5911ecdeec1cd5a75514

Requested commit: 9a97c5c3dbbeac94865a5911ecdeec1cd5a75514

Commit: 9a97c5c3dbbeac94865a5911ecdeec1cd5a75514

Tree: b13380b9664984e777e5aa63388918f34c3e2d26

Author: Oleksiy Syvokon

Committer: GitHub

## Message

```
ep: Add a prompt with git-style merge markers (#47215)

Release Notes:

- N/A
```

## Parents

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

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