go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-10-30 23:57:43 +02:00
Code Issues Releases Activity

couple of things to clean up after rebasing onto master

Browse Source
This commit is contained in:
Jesse Duffield
2019-11-21 21:17:31 +11:00
parent e36ee0b4f1
commit f905b27b00
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/commands/os.go
View File

@@ -10,7 +10,6 @@ import (
"strings"
"sync"
"github.com/davecgh/go-spew/spew"
"github.com/go-errors/errors"
"github.com/jesseduffield/lazygit/pkg/config"

2
pkg/gui/files_panel.go
View File

@@ -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)