Fix :Gstatus dd on unmerged path

Closes #240.
2012-08-15 11:22:40 -04:00 · 2012-08-15 11:22:40 -04:00 · a0c71a6d4c
commit a0c71a6d4c
parent 0abe1fb122
1 changed files with 2 additions and 0 deletions
--- a/plugin/fugitive.vim
+++ b/plugin/fugitive.vim
@ -691,6 +691,8 @@ function! s:stage_info(lnum) abort
    return [matchstr(filename, ': *\zs.*'), 'staged']
  elseif getline(lnum+2) =~# '^# .*"git checkout ' || getline(lnum) ==# '# Changes not staged for commit:'
    return [matchstr(filename, ': *\zs.*'), 'unstaged']
+  elseif getline(lnum+1) =~# '^# .*"git add/rm ' || getline(lnum) ==# '# Unmerged paths:'
+    return [matchstr(filename, ': *\zs.*'), 'unmerged']
  else
    return [filename, 'untracked']
  endif