Update gitconfig

Add diff to last merge alias