Changing log style for ll alias
Adding vimdiff as merge tool