StatusConflicted maps GIT_STATUS_CONFLICTED

Added support for file in conflicted status
2016-05-29 14:37:37 +02:00 · 2016-05-29 14:37:37 +02:00 · 82f86f2f13
parent 298f2e2111
commit 82f86f2f13
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 {