Permalink
Browse files

Fix :Gstatus dd on unmerged path

Closes #240.
  • Loading branch information...
1 parent 0abe1fb commit a0c71a6d4cb3b576ebbe42a270c8c48cbb23d185 @tpope committed Aug 15, 2012
Showing with 2 additions and 0 deletions.
  1. +2 −0 plugin/fugitive.vim
View
@@ -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

0 comments on commit a0c71a6

Please sign in to comment.