git://git.iain.cx/iain
/
profile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Vim 7.4 won't let us quit windows from a script.
[profile.git]
/
.vim
/
script
/
merge
diff --git
a/.vim/script/merge
b/.vim/script/merge
index
ad7c083
..
a00fea3
100644
(file)
--- 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.