Does merging capture both parents?

[Theodore Ts'o]

Right now, it looks like "hg update -m <node>" will merge a node into
the current working directory, and then a "hg commit" will only record
the parent of the working directory, but not <node> as a second parent.
Is that correct?

There were mention in the TODO file about multiple parents, but I don't
see any way of actually creating merge changesets.  Am I missing
something or is this To Be Implemented?

						- Ted