summaryrefslogtreecommitdiff
path: root/status.go
diff options
context:
space:
mode:
authorCarlos Martín Nieto <[email protected]>2016-08-27 19:27:10 +0200
committerGitHub <[email protected]>2016-08-27 19:27:10 +0200
commit0703dae9b29c1c47d67f2388342b7a0bc87f55b8 (patch)
tree5d5e842d89cf2910871a9f51299b67267afcd078 /status.go
parent1670c49c7e02ba38aa10072a102a33c3e6d5e1c3 (diff)
parent82f86f2f13213cfadfafc07a033c269095386dbc (diff)
Merge pull request #320 from netnose/enum-mappings
Enum Mappings
Diffstat (limited to 'status.go')
-rw-r--r--status.go1
1 files changed, 1 insertions, 0 deletions
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 {