evolve: preserve date when resolving content-divergence (issue6202) This patch changes the implementation to do a 3 way merge. In case of actual conflict, it take the newest date from both sides of the content-divergence.

test-drop.t
test-inhibit.t
test-simple4server.t
tests/test-simple4server-bundle2.t