2016-08-27 12:27:11 -05:00
1 changed files with 1 additions and 0 deletions
--- 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 {