summaryrefslogtreecommitdiff
path: root/diff.go
diff options
context:
space:
mode:
Diffstat (limited to 'diff.go')
-rw-r--r--diff.go1
1 files changed, 1 insertions, 0 deletions
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