aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md9
1 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c29cdec..5ea793b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,11 +7,18 @@ this project _somewhat_ adheres to [Semantic Versioning].
[Keep a Changelog]: https://keepachangelog.com/en/1.0.0/
[Semantic Versioning]: https://semver.org/spec/v2.0.0.html
+1.20.1 - 2020-05-08
+-------------------
+
+### Changed
+- Faster conflict resolution by using a conflict cache file.
+- Standardized `kiss-readlink` usage output.
+
1.20.0 - 2020-05-07
-------------------
### Added
-- `KISS_NOPROMPT` can be specified in order to skip prompts
+- `KISS_NOPROMPT` can be specified in order to skip prompts.
1.19.1 - 2020-05-07
-------------------