set ro
set nomodifiable
set nobuflisted
- set buftype=nowrite
- set bufhidden=hide
+ set buftype=help
setlocal noswapfile
exe "file \[ORIG:" . l:filename . "\]"
diffthis
set ro
set nomodifiable
set nobuflisted
- set buftype=nowrite
- set bufhidden=hide
+ set buftype=help
setlocal noswapfile
exe "file \[YOURS:" . l:filename . "\]"
diffthis
set ro
set nomodifiable
set nobuflisted
- set buftype=nowrite
+ set buftype=help
set bufhidden=hide
setlocal noswapfile
exe "file \[THEIRS:" . l:filename . "\]"
wincmd L
se modifiable
1
+
+ try
+ au QuitPre * qa!
+ endtry
+ catch
endfun
" Expand the command line window so we don't have to press RETURN later.