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

diff --git a/.vim/script/merge b/.vim/script/merge
index ad7c083..a00fea3 100644
--- a/.vim/script/merge
+++ b/.vim/script/merge
@@ -59,6 +59,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.