From bf4ec94cc9c76fe9b8501e6deba3cb68629d7db4 Mon Sep 17 00:00:00 2001 From: Tobias Warneke Date: Sun, 14 Mar 2021 23:42:10 +0100 Subject: [PATCH] fixes #117 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad47f32..fef10d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,9 @@ This project uses a custom versioning scheme (and not [Semantic Versioning](http * bugfixing on new UnifiedDiff reader / writer for multifile usage * bugfix for wrong DiffRow type while transforming from a patch that removed a line in one changeset * introduced change position into UnifiedDiff reader +* introduced first version of conflict output possibility (like GIT merge conflict) + * moved verification to `AbstractDelta` + * introduced `ConflictOutput` to `Patch` to add optional behaviour to patch conflicts ## [4.9]