vimdiff as a merge and diff tool, no diff prompt, some sourcetree git
configs