From 1e8b7ef38075268665a7157b072a8760374787aa Mon Sep 17 00:00:00 2001
From: Hans Rødtang <hansrodtang@gmail.com>
Date: Tue, 29 Mar 2016 20:37:22 +0200
Subject: Add "Conflicted" git.Delta and git.Status.

---
 status.go | 1 +
 1 file changed, 1 insertion(+)

(limited to 'status.go')

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 {
-- 
cgit v1.2.3