motiejus/dotfiles

commit d4e06150cb837cdf9db3148a643487ee9342c3fe (tree)
parent 61d467b573b3dfeebeb6ffd3d7fb7addd9b304c8
Author: Tim Pope <code@tpope.net>
Date:   Wed,  2 Jan 2019 14:12:46 -0500

Fix issue loading conflict buffers on :Grebase -i

Diffstat:
M
autoload/fugitive.vim
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
@@ -2478,7 +2478,7 @@ augroup fugitive_merge
         \     let s:rebase_continue = FugitiveGitDir(+expand('<abuf>')) |
         \   endif |
         \ endif
-  autocmd BufEnter *
+  autocmd BufEnter * nested
         \ 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')) |
         \ endif