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

diff --git a/.vim/script/merge b/.vim/script/merge
index ad7c083..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 . "\]"
@@ -59,6 +57,11 @@ fun! P4merge()
   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.