Add MERGE_MSG to floaterm#edita#neovim#editor#open

This fixes the error: E211: File "<some_path>/.git/MERGE_MSG" no longer available
voldikss · Apr 2, 2024 · fe61226 · fe61226
1 parent c0535d7
commit fe61226
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/autoload/floaterm/edita/neovim/editor.vim b/autoload/floaterm/edita/neovim/editor.vim
@@ -7,6 +7,7 @@ function! floaterm#edita#neovim#editor#open(target, client)
   let b:edita = sockconnect(mode, a:client, { 'rpc': 1 })
   if index([
         \ 'COMMIT_EDITMSG',
+        \ 'MERGE_MSG',
         \ 'git-rebase-todo',
         \ 'git-revise-todo',
         \ 'addp-hunk-edit.diff'

diff --git a/autoload/floaterm/edita/vim/editor.vim b/autoload/floaterm/edita/vim/editor.vim
@@ -7,6 +7,7 @@ function! floaterm#edita#vim#editor#open(target, bufnr)
   let b:edita = a:bufnr
   if index([
         \ 'COMMIT_EDITMSG',
+        \ 'MERGE_MSG',
         \ 'git-rebase-todo',
         \ 'git-revise-todo',
         \ 'addp-hunk-edit.diff'