SVN-like merging

[Sébastien Pierre]

Hi all,

I would like to know if there is an option to do SVN-like merging:

- When updating (checking out) a revision that has conflicts with the
current one, original files are copied and appended the ".orig" suffix
and new files are checked-out as ".new".

- The user can then manually resolve each conflict. Conflict resolution
is explicitely notified by running the "resolve" command with the name
of the resolved conflict.

Is this possible in Mercurial ?

 -- Sébastien