jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Add "Conflicted" git.Delta and git.Status.

This commit is contained in:
Hans Rødtang 2016-03-29 20:37:22 +02:00
parent 836b6c56be
commit 1e8b7ef380
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
diff.go
View File

@ -34,6 +34,7 @@ const (
DeltaIgnored Delta = C.GIT_DELTA_IGNORED DeltaIgnored Delta = C.GIT_DELTA_IGNORED
DeltaUntracked Delta = C.GIT_DELTA_UNTRACKED DeltaUntracked Delta = C.GIT_DELTA_UNTRACKED
DeltaTypeChange Delta = C.GIT_DELTA_TYPECHANGE DeltaTypeChange Delta = C.GIT_DELTA_TYPECHANGE
DeltaConflicted Delta = C.GIT_DELTA_CONFLICTED
) )
type DiffLineType int type DiffLineType int

1
status.go
View File

@ -25,6 +25,7 @@ const (
StatusWtTypeChange Status = C.GIT_STATUS_WT_TYPECHANGE StatusWtTypeChange Status = C.GIT_STATUS_WT_TYPECHANGE
StatusWtRenamed Status = C.GIT_STATUS_WT_RENAMED StatusWtRenamed Status = C.GIT_STATUS_WT_RENAMED
StatusIgnored Status = C.GIT_STATUS_IGNORED StatusIgnored Status = C.GIT_STATUS_IGNORED
StatusConflicted Status = C.GIT_STATUS_CONFLICTED
) )
type StatusEntry struct { type StatusEntry struct {