a7071092__v_5____illumos___illumos_wiki__hg_description
[hg command] hg merge [git command] git merge/git pull [hg description] 
merge working directory with another revision
Page Comparison - hg git Rosetta Stone (v.4 vs v.5) - illumos - illumos wiki
hg description