不是您具体问题的答案,但这里有一些不错的差异调整可能会有所帮助。
"" Diff options; ignore whitespace.
set diffopt+=iwhite
我不喜欢 :diffon :diffoff 因为它们弄乱了自动换行(退出 diff 时打开它)。所以我只设置了 diff、scrollbind、foldmarker 和 foldcolumn。
"" Diff 'd' {{{
nmap <silent> ,dd :set diff scb fdm=diff fdc=2<CR>
nmap <silent> ,dD :windo :set diff scb fdm=diff fdc=2<CR>
nmap <silent> ,do :set nodiff noscb fdm=manual fdc=0<CR>
nmap <silent> ,dO :windo :set nodiff noscb fdm=manual fdc=0<CR>
"nmap <silent> ,dd :diffthis<CR>
"nmap <silent> ,dD :windo :diffthis<CR>
"nmap <silent> ,do :diffoff<CR>
"nmap <silent> ,dO :windo :diffoff<CR>
nmap <silent> ,du :diffupdate<CR>
"" }}}
另外,如果您还没有,请查看 DirDiff 插件以区分目录树...