Fixed missing vimdiff wrapper
Default git's behaviour now is rebase