adding hg pdiff alias
merge
merge