From f905b27b00d827c6745824c5b45c06188313344e Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Thu, 21 Nov 2019 21:17:31 +1100 Subject: [PATCH] couple of things to clean up after rebasing onto master --- pkg/commands/os.go | 1 - pkg/gui/files_panel.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/commands/os.go b/pkg/commands/os.go index fed34a408..8f49483c6 100644 --- a/pkg/commands/os.go +++ b/pkg/commands/os.go @@ -10,7 +10,6 @@ import ( "strings" "sync" - "github.com/davecgh/go-spew/spew" "github.com/go-errors/errors" "github.com/jesseduffield/lazygit/pkg/config" diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index f9983f583..5f68f3fab 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -116,7 +116,7 @@ func (gui *Gui) refreshFiles() error { } fmt.Fprint(filesView, list) - if g.CurrentView() == filesView || (g.CurrentView() == gui.getMainView() && gui.State.Context == "merging") { + if g.CurrentView() == filesView || (g.CurrentView() == gui.getMainView() && g.CurrentView().Context == "merging") { newSelectedFile, _ := gui.getSelectedFile(gui.g) alreadySelected := newSelectedFile.Name == selectedFile.Name return gui.selectFile(alreadySelected)