merge ssh from hg