kolan
/
.home
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VimDiff: do/dp shortcuts for 3-way diffs.

This commit is contained in:
Kolan Sh 2013-04-10 14:30:36 +04:00
parent b8a726bd5e
commit 299284c149
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.vimrc
View File

@ -216,3 +216,14 @@ let g:tagbar_ctags_bin = "anjuta-tags"
" ----- NERDTree ------
nmap <F12> :NERDTreeToggle<CR>
" ------- VimDiff -------
if &diff
let mapleader = ","
map dp1 :diffput LOCAL<CR>
map dp2 :diffput BASE<CR>
map dp3 :diffput REMOTE<CR>
map do1 :diffget LOCAL<CR>
map do2 :diffget BASE<CR>
map do3 :diffget REMOTE<CR>
endif