diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim index b33f269..f29aeac 100644 --- a/autoload/fugitive.vim +++ b/autoload/fugitive.vim @@ -3758,7 +3758,7 @@ function! s:PullSubcommand(line1, line2, range, bang, mods, args) abort return s:MergeRebase('pull', a:bang, a:mods, a:args) endfunction -function! s:RebaseContinue(arg) abort +function! s:RebaseContinue(arg, ...) abort let [dir, edit_todo] = a:arg exe s:MergeRebase('rebase', 0, '', [edit_todo && getfsize(fugitive#Find('.git/rebase-merge/git-rebase-todo', dir)) <= 0 ? '--abort' : '--continue'], dir) endfunction @@ -3774,7 +3774,7 @@ augroup fugitive_merge \ endif autocmd BufEnter * nested \ if exists('s:rebase_continue') | - \ if has('timer') | + \ if has('timers') | \ call timer_start(0, function('s:RebaseContinue', [remove(s:, 'rebase_continue')])) | \ else | \ call s:RebaseContinue(remove(s:, 'rebase_continue')) |