mergestate: simplify reset(), knowing that other and node go together

There's only one caller of reset() that passes any arguments at all,
and that originates from merge.py:1371. That code always passes
values for both node and other.

Differential Revision: https://phab.mercurial-scm.org/D9032