| commit | 82f86f2f13213cfadfafc07a033c269095386dbc | [log] [tgz] |
|---|---|---|
| author | Mirko Nosenzo <netnose@gmail.com> | Sun May 29 14:37:37 2016 +0200 |
| committer | Mirko Nosenzo <netnose@gmail.com> | Sun May 29 15:01:17 2016 +0200 |
| tree | 7555880533d83bd44d1a57f3695d04721f02457e | |
| parent | 298f2e2111905388e3d10cd0db0221a22dc7a62f [diff] |
StatusConflicted maps GIT_STATUS_CONFLICTED Added support for file in conflicted status
diff --git a/status.go b/status.go index 068a474..e68e6e9 100644 --- a/status.go +++ b/status.go
@@ -25,6 +25,7 @@ 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 {