alias hr="hg resolve"