Vimdiff is a tool that comes bundled with Vim and its a wonderful tool for comparing code and merging changes Keyboard Shortcuts: do – Get changes from other window into the current window. dp – Put the changes from current window into the other window. ]c – Jump to the next change. [c – Jump  Full Article…