evolve: fix content-divergence resolution when p1 and/or p2 is null

Merge request reports

Loading