From 82f86f2f13213cfadfafc07a033c269095386dbc Mon Sep 17 00:00:00 2001
From: Mirko Nosenzo <netnose@gmail.com>
Date: Sun, 29 May 2016 14:37:37 +0200
Subject: [PATCH] StatusConflicted maps GIT_STATUS_CONFLICTED

Added support for file in conflicted status
---
 status.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/status.go b/status.go
index 068a474..e68e6e9 100644
--- a/status.go
+++ b/status.go
@@ -25,6 +25,7 @@ const (
 	StatusWtTypeChange    Status = C.GIT_STATUS_WT_TYPECHANGE
 	StatusWtRenamed       Status = C.GIT_STATUS_WT_RENAMED
 	StatusIgnored         Status = C.GIT_STATUS_IGNORED
+	StatusConflicted      Status = C.GIT_STATUS_CONFLICTED
 )
 
 type StatusEntry struct {