QuickBits-3: Vim diff

Most often when you are working in shell you want to find diff between two files and merge them. vimdiff is very good utility.

 vim -d file1 file2 

Keyboard Shortcuts:

ctrl+w ctrl+w - switch windows
do                                - diff obtain
dp                                - diff put
[c                                - previous difference
]c                                - next difference
:diffupdate                       - diff update ;)
:syntax off                       - syntax off
zo                                - open folded text
zc                                - close folded text