diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-12 21:24:01 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-14 22:22:47 +1100 |
| commit | 7995d56a858fdeb399ed884a6983008aa2089cfb (patch) | |
| tree | 3eee8bd6d332e262a61f7f025e6658a62a77c485 /pkg/gui/files_panel.go | |
| parent | 30aed94aa8451911fc1c5ba1e52ff28b180a8d31 (diff) | |
allow editing or opening a file while resolving merge conflicts
Diffstat (limited to 'pkg/gui/files_panel.go')
| -rw-r--r-- | pkg/gui/files_panel.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 56ca123b4..af021c132 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -66,6 +66,8 @@ func (gui *Gui) handleFileSelect(g *gocui.Gui, v *gocui.View, alreadySelected bo } if file.HasInlineMergeConflicts { + gui.getMainView().Title = gui.Tr.SLocalize("MergeConflictsTitle") + gui.State.SplitMainPanel = false return gui.refreshMergePanel() } |