summaryrefslogtreecommitdiff
path: root/status.go
diff options
context:
space:
mode:
authorCarlos Martín Nieto <[email protected]>2016-03-31 04:44:23 -0700
committerCarlos Martín Nieto <[email protected]>2016-03-31 04:44:23 -0700
commit652a14f732bb3b96fc77baf53f78d74175ac2e0a (patch)
tree110e057d7f1dad0eba0a50fcb749d2add00b9a07 /status.go
parent836b6c56bef179785db6c6cfd98c6f0cc7cebdcb (diff)
parent2be7d7987b40fad0ee064e2feb5a132fd9ed3c4c (diff)
Merge pull request #301 from hansrodtang/next
Add some constants and repository methods.
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 {