diff options
| author | Hans Rødtang <[email protected]> | 2016-03-29 20:37:22 +0200 |
|---|---|---|
| committer | Hans Rødtang <[email protected]> | 2016-03-29 20:37:22 +0200 |
| commit | 1e8b7ef38075268665a7157b072a8760374787aa (patch) | |
| tree | 53aac9f33f1005dba359c06f7b850dbfda55972c /status.go | |
| parent | 836b6c56bef179785db6c6cfd98c6f0cc7cebdcb (diff) | |
Add "Conflicted" git.Delta and git.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 { |
