Fix :Gstatus dd on unmerged path

Closes #240.
tpope · Aug 15, 2012 · a0c71a6 · a0c71a6
1 parent 0abe1fb
commit a0c71a6
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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