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.

{"pattern": "glob:hgext3rd/**/*.py", "tool": "byteify-strings"}