We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent fb2a182 commit cd0066eCopy full SHA for cd0066e
plugin/diffconflicts.vim
@@ -21,13 +21,15 @@ endfunction
21
22
function! s:diffconfl()
23
let l:origBuf = bufnr("%")
24
+ let l:origFt = &filetype
25
26
" Set up the right-hand side.
27
rightb vsplit
28
enew
29
silent execute "read #". l:origBuf
30
1delete
31
silent execute "file RCONFL"
32
+ silent execute "set filetype=". l:origFt
33
silent execute "g/^<<<<<<< /,/^=======\\r\\?$/d"
34
silent execute "g/^>>>>>>> /d"
35
setlocal nomodifiable readonly buftype=nofile bufhidden=delete nobuflisted
0 commit comments