evolve: preserve date when resolving content-divergence (issue6202)

I didn’t find a way to not include the changeset from !19 (closed) in the merge request.

Merge request reports

Loading