remote-hg: tests: fix hg merge