diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2019-03-03 15:55:19 +1100 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-03-03 15:58:01 +1100 |
commit | 00790151025ad58a0bf2b0913c5dd4983fc65b24 (patch) | |
tree | 71dd76b56e83535adee6cc8d0532217848ce22eb /pkg/commands/file.go | |
parent | 7a2176f479dbffa6ddc9c2c1853db416add3c3f3 (diff) |
distinguish between inline and non-inline merge conflicts
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 |