Read existing palette colour.

[profile.git] / .vim / script / merge

diff --git a/.vim/script/merge b/.vim/script/merge
index ad7c083..992108a 100644 (file)
--- 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.