Added info on how to get diff merge in the gitconfig