mirror of
https://github.com/amix/vimrc
synced 2025-07-26 22:45:00 +08:00
.
This commit is contained in:
4
sources_non_forked/vim-gitgutter/autoload/gitgutter/diff.vim
Normal file → Executable file
4
sources_non_forked/vim-gitgutter/autoload/gitgutter/diff.vim
Normal file → Executable file
@ -6,11 +6,7 @@ let s:hunk_re = '^@@ -\(\d\+\),\?\(\d*\) +\(\d\+\),\?\(\d*\) @@'
|
||||
|
||||
" True for git v1.7.2+.
|
||||
function! s:git_supports_command_line_config_override() abort
|
||||
<<<<<<< HEAD
|
||||
call system(g:gitgutter_git_executable.' '.g:gitgutter_git_args.' -c foo.bar=baz --version')
|
||||
=======
|
||||
call gitgutter#utility#system(g:gitgutter_git_executable.' '.g:gitgutter_git_args.' -c foo.bar=baz --version')
|
||||
>>>>>>> 27ad0d07862847896f691309a544a206783c94d6
|
||||
return !v:shell_error
|
||||
endfunction
|
||||
|
||||
|
Reference in New Issue
Block a user