diff options
Diffstat (limited to 'pkg/commands/git_structs.go')
-rw-r--r-- | pkg/commands/git_structs.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkg/commands/git_structs.go b/pkg/commands/git_structs.go index dd28d15fa..2f7255be1 100644 --- a/pkg/commands/git_structs.go +++ b/pkg/commands/git_structs.go @@ -2,7 +2,7 @@ package commands // File : A staged/unstaged file // TODO: decide whether to give all of these the Git prefix -type GitFile struct { +type File struct { Name string HasStagedChanges bool HasUnstagedChanges bool @@ -27,8 +27,10 @@ type StashEntry struct { DisplayString string } -// Branch : A git branch -type Branch struct { - Name string - Recency string +// Conflict : A git conflict with a start middle and end corresponding to line +// numbers in the file where the conflict bars appear +type Conflict struct { + start int + middle int + end int } |