# git: For conflicted files, set project diff excerpts using conflicts only \(\#44263\) · gitcafe/zed

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

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

Visibility: public

Requested revision: 66c7bdf037c51659e5848e72bf27a77980e14df4

Requested commit: 66c7bdf037c51659e5848e72bf27a77980e14df4

Commit: 66c7bdf037c51659e5848e72bf27a77980e14df4

Tree: ea0dfaeff0c3f6fb407a0989d447c458814dd512

Author: Cole Miller

Committer: GitHub

## Message

```
git: For conflicted files, set project diff excerpts using conflicts only (#44263)

It's just distracting having excerpts for all the successfully merged
hunks.

Release Notes:

- git: The project diff now focuses on merge conflicts for files that
have them.
```

## Parents

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

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