diff options
| author | Tharre <tharre3@gmail.com> | 2015-04-21 10:52:54 +0200 |
|---|---|---|
| committer | Tharre <tharre3@gmail.com> | 2016-10-07 20:08:47 +0000 |
| commit | fb54d3799ad526719cb64bb57cac3ef7f54f300c (patch) | |
| tree | f54f4369f07003813b47462a21268db17c2d5ccd /shell | |
| parent | 222750b85e434016a5c7ad61852497804e63f844 (diff) | |
| download | dotfiles-fb54d3799ad526719cb64bb57cac3ef7f54f300c.tar.gz dotfiles-fb54d3799ad526719cb64bb57cac3ef7f54f300c.tar.xz dotfiles-fb54d3799ad526719cb64bb57cac3ef7f54f300c.zip | |
vim: add keybindings for diff mode
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/_vimrc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/shell/_vimrc b/shell/_vimrc index fd3e5c7..5e83a39 100644 --- a/shell/_vimrc +++ b/shell/_vimrc @@ -85,6 +85,10 @@ set cc=81 set list set listchars=tab:>-,trail:~ +map <silent> <leader>1 :diffget 2<CR> :diffupdate<CR> +map <silent> <leader>2 :diffget 3<CR> :diffupdate<CR> +map <silent> <leader>3 :diffget 4<CR> :diffupdate<CR> + autocmd InsertEnter * :let @/="" autocmd InsertLeave * :let @/="" |