From 0a19a3e78ff01276943294e2b812873552fe3c4b Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Fri, 20 Jun 2014 07:52:06 -0400
Subject: [PATCH] Fix untracked false positive on unmerged files

References #440.
---
 plugin/fugitive.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim
index 4365c1f..cbb7b71 100644
--- a/plugin/fugitive.vim
+++ b/plugin/fugitive.vim
@@ -742,7 +742,7 @@ function! s:stage_info(lnum) abort
     return ['', '']
   elseif (getline(lnum+1) =~# '^# .*\<git \%(reset\|rm --cached\) ' && getline(lnum+2) ==# '#') || getline(lnum) ==# '# Changes to be committed:'
     return [matchstr(filename, colon.' *\zs.*'), 'staged']
-  elseif (getline(lnum+1) =~# '^# .*\<git add ' && getline(lnum+2) ==# '#') || getline(lnum) ==# '# Untracked files:'
+  elseif (getline(lnum+1) =~# '^# .*\<git add ' && getline(lnum+2) ==# '#' && getline(lnum+3) !~# colon.'  ') || getline(lnum) ==# '# Untracked files:'
     return [filename, 'untracked']
   elseif getline(lnum+2) =~# '^# .*\<git checkout ' || getline(lnum) ==# '# Changes not staged for commit:'
     return [matchstr(filename, colon.' *\zs.*'), 'unstaged']