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.
-------------------------
Evolve Commands Reference
-------------------------
.. highlight:: none
amend
-----
.. hghelp:: amend
evolve
------
.. hghelp:: evolve
fold
----
.. hghelp:: fold
metaedit
--------
.. hghelp:: metaedit
next
----
.. hghelp:: next
obslog
------
.. hghelp:: obslog
pdiff
-----
.. hghelp:: pdiff
previous
--------
.. hghelp:: previous
prune
-----
.. hghelp:: prune
pstatus
-------
.. hghelp:: pstatus
split
-----
.. hghelp:: split
touch
-----
.. hghelp:: touch
uncommit
--------
.. hghelp:: uncommit