remote-hg: match hg merge behavior