Created
November 2, 2013 11:47
-
-
Save haya14busa/7278072 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| " Mapping for vimdiff{{{ | |
| " for git mergetool | |
| if &diff | |
| map <Leader>1 :diffget LOCAL<CR> | |
| map <Leader>2 :diffget BASE<CR> | |
| map <Leader>3 :diffget REMOTE<CR> | |
| map <Leader>u :<C-u>diffupdate<CR> | |
| map u u:<C-u>diffupdate<CR> | |
| endif | |
| "}}} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment