Diff aliases for HEAD and origin/master; Difftool aliases; p4v merge tool