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