Add merge alias with support for Git and Mercurial