From 9fed464f99163ee384b2de883fafcd1f197d2552 Mon Sep 17 00:00:00 2001
From: Stephan Dilly <dilly.stephan@gmail.com>
Date: Tue, 9 Mar 2021 14:22:21 +0100
Subject: [PATCH] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

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