diff options
Diffstat (limited to 'pkg/commands/file.go')
| -rw-r--r-- | pkg/commands/file.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkg/commands/file.go b/pkg/commands/file.go index 3a5073af4..39d989634 100644 --- a/pkg/commands/file.go +++ b/pkg/commands/file.go @@ -5,14 +5,15 @@ import "github.com/fatih/color" // File : A file from git status // duplicating this for now type File struct { - Name string - HasStagedChanges bool - HasUnstagedChanges bool - Tracked bool - Deleted bool - HasMergeConflicts bool - DisplayString string - Type string // one of 'file', 'directory', and 'other' + Name string + HasStagedChanges bool + HasUnstagedChanges bool + Tracked bool + Deleted bool + HasMergeConflicts bool + HasInlineMergeConflicts bool + DisplayString string + Type string // one of 'file', 'directory', and 'other' } // GetDisplayStrings returns the display string of a file |