Adding p4merge alias