[vimdiff] Good tools - Compare two file

Open the vimdiff

•  vim the file, under vim type :vs <another file>. Type diffthis will activate vimdiff.

•  :diffoff can be used to turn off the diff mode.

---

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 to the previous change.

Ctrl W + Ctrl W - Switch to the other split window


Reference:

1. Quick and Dirty : Vimdiff Tutorial