vim/vim-fugitive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix issue loading conflict buffers on :Grebase -i

Browse Source
This commit is contained in:
Tim Pope 2019-01-02 14:12:46 -05:00
parent 61d467b573
commit d4e06150cb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/fugitive.vim
View File

@ -2478,7 +2478,7 @@ augroup fugitive_merge
\ let s:rebase_continue = FugitiveGitDir(+expand('<abuf>')) | \ let s:rebase_continue = FugitiveGitDir(+expand('<abuf>')) |
\ endif | \ endif |
\ endif \ endif
autocmd BufEnter * autocmd BufEnter * nested
\ if exists('s:rebase_continue') | \ if exists('s:rebase_continue') |
\ exe s:Merge('rebase', 0, '', getfsize(fugitive#Find('.git/rebase-merge/git-rebase-todo', s:rebase_continue)) > 0 ? '--continue' : '--abort', remove(s:, 'rebase_continue')) | \ exe s:Merge('rebase', 0, '', getfsize(fugitive#Find('.git/rebase-merge/git-rebase-todo', s:rebase_continue)) > 0 ? '--continue' : '--abort', remove(s:, 'rebase_continue')) |
\ endif \ endif