X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.vim%2Fscript%2Fmerge;h=992108aacff14cffb5baee09e9bc49212ab19296;hb=0d1d3e8398fd0d7844edf1e2ad13d1adc245de17;hp=a00fea385f53373ee26e28820ced1911ce23df9a;hpb=06d0d0563b6cee6b5291563c080daac155b83cb2;p=profile.git

diff --git a/.vim/script/merge b/.vim/script/merge
index a00fea3..992108a 100644
--- a/.vim/script/merge
+++ b/.vim/script/merge
@@ -22,8 +22,7 @@ fun! P4merge()
   set ro
   set nomodifiable
   set nobuflisted
-  set buftype=nowrite
-  set bufhidden=hide
+  set buftype=help
   setlocal noswapfile
   exe "file \[ORIG:" . l:filename . "\]"
   diffthis
@@ -34,8 +33,7 @@ fun! P4merge()
   set ro
   set nomodifiable
   set nobuflisted
-  set buftype=nowrite
-  set bufhidden=hide
+  set buftype=help
   setlocal noswapfile
   exe "file \[YOURS:" . l:filename . "\]"
   diffthis
@@ -47,7 +45,7 @@ fun! P4merge()
   set ro
   set nomodifiable
   set nobuflisted
-  set buftype=nowrite
+  set buftype=help
   set bufhidden=hide
   setlocal noswapfile
   exe "file \[THEIRS:" . l:filename . "\]"