diff --git a/CHANGELOG.md b/CHANGELOG.md index 75b7669c..ae36c486 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - support discarding diff by lines ([#59](https://github.com/extrawurst/gitui/issues/59)) - support for pushing tags ([#568](https://github.com/extrawurst/gitui/issues/568)) +- visualize *conflicted* files differently ([#576](https://github.com/extrawurst/gitui/issues/576)) ## [0.12.0] - 2020-03-03