Git tip to use vimdiff
There are useful hotkeys to resolve merge conflict using vimdiff