# Merge pull request \#7778 from g-w1/stage2-merge-errors · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/5bd9a6451685ad056628e312aadaf80e66a4c004)

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

Visibility: public

Requested revision: 5bd9a6451685ad056628e312aadaf80e66a4c004

Requested commit: 5bd9a6451685ad056628e312aadaf80e66a4c004

Commit: 5bd9a6451685ad056628e312aadaf80e66a4c004

Tree: 3a7afa14fcfdcaf4f07acca0f52e5e545e8f6708

Author: Andrew Kelley

Committer: GitHub

## Message

```
Merge pull request #7778 from g-w1/stage2-merge-errors

stage2: error set merging with tests
```

## Parents

- [4b57fb5f23aa6513ceaebe396d1faf215cf0a475](https://git.cafe/gitcafe/zig/commit/4b57fb5f23aa6513ceaebe396d1faf215cf0a475?format=markdown)

- [39957832071cd999d6abc16c91e12c4820a2a738](https://git.cafe/gitcafe/zig/commit/39957832071cd999d6abc16c91e12c4820a2a738?format=markdown)

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