Fixed merge for Perforce stuff

master
Dustin Swan 13 years ago
commit 8f2a4f08b0

@ -128,4 +128,5 @@ inoremap kj <Esc>
inoremap <Esc> <nop> inoremap <Esc> <nop>
nnoremap <Esc> :noh<CR><Esc> nnoremap <Esc> :noh<CR><Esc>
" open the current file for edit in Perforce
nnoremap <leader>p :! p4 edit %<CR> nnoremap <leader>p :! p4 edit %<CR>

Loading…
Cancel
Save