From 52aaf4ecba1e2a8541174a6a04bbf696b84f6082 Mon Sep 17 00:00:00 2001
From: Ivan Wills <Ivan.Wills2@optus.com.au>
Date: Tue, 29 Mar 2016 07:51:18 +1100
Subject: [PATCH] Fixed more newer/older git issues

---
 lib/VCS/Which/Plugin/Git.pm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/VCS/Which/Plugin/Git.pm b/lib/VCS/Which/Plugin/Git.pm
index 168550c..b659a90 100644
--- a/lib/VCS/Which/Plugin/Git.pm
+++ b/lib/VCS/Which/Plugin/Git.pm
@@ -271,14 +271,22 @@ sub status {
         else {
             $untracked =~ s/^[#].*?\n//gxms;
         }
-        $status{untracked} = [ grep {$_} map {chomp; $_} split /\n?[#]?\s+/, $untracked ];
+
+        if ($untracked =~ /^[#]/xms) {
+            $status{untracked} = [ grep {$_} map {chomp; $_} split /\n?[#]\s+/, $untracked ];
+        }
+        else {
+            $status{untracked} = [ $untracked =~ /^\t(.*?)\n/gxms ];
+        }
     }
 
-    $status{merge} = $status =~ /
+    if ($status =~ /
         You \s+ have \s+ unmerged \s+ paths[.]$
         |
         All \s+ conflicts \s+ fixed \s+ but \s+ you \s+ are \s+ still \s+ merging[.]$
-    /xms;
+    /xms) {
+        $status{merge} = 1;
+    }
 
     return \%status;
 }