diff options
| author | Mirko Nosenzo <[email protected]> | 2016-05-29 14:37:37 +0200 |
|---|---|---|
| committer | Mirko Nosenzo <[email protected]> | 2016-05-29 15:01:17 +0200 |
| commit | 82f86f2f13213cfadfafc07a033c269095386dbc (patch) | |
| tree | 7555880533d83bd44d1a57f3695d04721f02457e /status.go | |
| parent | 298f2e2111905388e3d10cd0db0221a22dc7a62f (diff) | |
StatusConflicted maps GIT_STATUS_CONFLICTED
Added support for file in conflicted status
Diffstat (limited to 'status.go')
| -rw-r--r-- | status.go | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 { |
