sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-28 16:02:01 +03:00
Code Activity

acknowledge 'DU' statuses as being merge conflicts

Browse Source
This commit is contained in:
Jesse Duffield
2019-03-03 15:48:16 +11:00
parent e0bdfad63a
commit 7a2176f479
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/git.go
View File

@ -156,7 +156,7 @@ func (c *GitCommand) GetStatusFiles() []*File {
HasUnstagedChanges: unstagedChange != " ", HasUnstagedChanges: unstagedChange != " ",
Tracked: !untracked, Tracked: !untracked,
Deleted: unstagedChange == "D" || stagedChange == "D", Deleted: unstagedChange == "D" || stagedChange == "D",
HasMergeConflicts: change == "UU" || change == "AA", HasMergeConflicts: change == "UU" || change == "AA" || change == "DU",
Type: c.OSCommand.FileType(filename), Type: c.OSCommand.FileType(filename),
} }
files = append(files, file) files = append(files, file)