vim diff tips

vimdiff FILE1 FILE2 或者 vim -d
ctrl + w 在两个窗口间切换
:diffupdate 修改文件后，手工刷新比较结果
:qa 全部退出
:wa 全部保存
:wqa 全部保存退出

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
:syntax off 关闭语法着色
zo--open folded text
zc--close folded text