diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-03-03 15:48:16 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-03-03 15:48:16 +1100 |
| commit | 7a2176f479dbffa6ddc9c2c1853db416add3c3f3 (patch) | |
| tree | 0cce43f5213e4d447bfcc3f6331fbbbbde82be23 /pkg/commands | |
| parent | e0bdfad63a458513aeadfedc724a040cb6cb0684 (diff) | |
acknowledge 'DU' statuses as being merge conflicts
Diffstat (limited to 'pkg/commands')
| -rw-r--r-- | pkg/commands/git.go | 2 |
1 files changed, 1 insertions, 1 deletions
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) |