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.

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

(limited to 'diff.go')

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