Git diff, merge with vimdiff