From a0c71a6d4cb3b576ebbe42a270c8c48cbb23d185 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Wed, 15 Aug 2012 11:22:40 -0400
Subject: [PATCH] Fix :Gstatus dd on unmerged path

Closes #240.
---
 plugin/fugitive.vim | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim
index f710f3d..3b5e91f 100644
--- 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