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/gui/files_panel.go | |
parent | 7a2176f479dbffa6ddc9c2c1853db416add3c3f3 (diff) |
distinguish between inline and non-inline merge conflicts
Diffstat (limited to 'pkg/gui/files_panel.go')
-rw-r--r-- | pkg/gui/files_panel.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index b1d1bcb5f..c401ac876 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -67,7 +67,7 @@ func (gui *Gui) handleFileSelect(g *gocui.Gui, v *gocui.View, alreadySelected bo return err } - if file.HasMergeConflicts { + if file.HasInlineMergeConflicts { return gui.refreshMergePanel() } @@ -172,10 +172,10 @@ func (gui *Gui) handleEnterFile(g *gocui.Gui, v *gocui.View) error { } return nil } - if file.HasMergeConflicts { + if file.HasInlineMergeConflicts { return gui.handleSwitchToMerge(g, v) } - if !file.HasUnstagedChanges { + if !file.HasUnstagedChanges || file.HasMergeConflicts { return gui.createErrorPanel(g, gui.Tr.SLocalize("FileStagingRequirements")) } if err := gui.changeContext("main", "staging"); err != nil { @@ -196,7 +196,7 @@ func (gui *Gui) handleFilePress(g *gocui.Gui, v *gocui.View) error { return err } - if file.HasMergeConflicts { + if file.HasInlineMergeConflicts { return gui.handleSwitchToMerge(g, v) } @@ -458,7 +458,7 @@ func (gui *Gui) handleSwitchToMerge(g *gocui.Gui, v *gocui.View) error { } return nil } - if !file.HasMergeConflicts { + if !file.HasInlineMergeConflicts { return gui.createErrorPanel(g, gui.Tr.SLocalize("FileNoMergeCons")) } if err := gui.changeContext("main", "merging"); err != nil { |