go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-25 22:32:13 +02:00
Code Issues Releases Activity

distinguish between inline and non-inline merge conflicts

Browse Source
This commit is contained in:
Jesse Duffield
2019-03-03 15:55:19 +11:00
parent 7a2176f479
commit 0079015102
4 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/commands/file.go
View File

@@ -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