use vimdiff for git diffing :)