hg: fixed vimdiff args
hg: some aliases for using branches