From 1e8b7ef38075268665a7157b072a8760374787aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20R=C3=B8dtang?= <hansrodtang@gmail.com>
Date: Tue, 29 Mar 2016 20:37:22 +0200
Subject: [PATCH] Add "Conflicted" git.Delta and git.Status.

---
 diff.go   | 1 +
 status.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/diff.go b/diff.go
index 565fcee..38505d2 100644
--- a/diff.go
+++ b/diff.go
@@ -34,6 +34,7 @@ const (
 	DeltaIgnored    Delta = C.GIT_DELTA_IGNORED
 	DeltaUntracked  Delta = C.GIT_DELTA_UNTRACKED
 	DeltaTypeChange Delta = C.GIT_DELTA_TYPECHANGE
+	DeltaConflicted Delta = C.GIT_DELTA_CONFLICTED
 )
 
 type DiffLineType int
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 {