NEWS


conflicted 1.2.0.9000

conflicted 1.2.0 (2023-02-01)

conflicted 1.1.0 (2021-11-26)

conflicted 1.0.4 (2019-06-21)

conflicted 1.0.3 (2019-05-01)

conflicted 1.0.2 (2019-03-29)

conflicted 1.0.1 (2018-10-02)

conflicted 1.0.0 (2018-09-15)

New functions

Improve conflict resolution

Minor improvements and bug fixes