From 7a2176f479dbffa6ddc9c2c1853db416add3c3f3 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 3 Mar 2019 15:48:16 +1100 Subject: [PATCH] acknowledge 'DU' statuses as being merge conflicts --- pkg/commands/git.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/commands/git.go b/pkg/commands/git.go index 9aa556ed4..0e78f3f6b 100644 --- a/pkg/commands/git.go +++ b/pkg/commands/git.go @@ -156,7 +156,7 @@ func (c *GitCommand) GetStatusFiles() []*File { HasUnstagedChanges: unstagedChange != " ", Tracked: !untracked, Deleted: unstagedChange == "D" || stagedChange == "D", - HasMergeConflicts: change == "UU" || change == "AA", + HasMergeConflicts: change == "UU" || change == "AA" || change == "DU", Type: c.OSCommand.FileType(filename), } files = append(files, file)