Git merge alias - why did I not have this before?