diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 12:08:13 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 13:19:35 +1100 |
| commit | a9559a5c8738d6938f8750f0729f077e0842800e (patch) | |
| tree | 6bf8ae15c80891325227261d46880d5f2e553c0b /pkg/gui/merge_panel.go | |
| parent | 814ee24c8d13ae554925530ec68f325394ddfe6d (diff) | |
move working tree state function into git.go
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index fa238ccb7..ba222a493 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -281,7 +281,7 @@ func (gui *Gui) handleCompleteMerge() error { } // if we got conflicts after unstashing, we don't want to call any git // commands to continue rebasing/merging here - if gui.workingTreeState() == "normal" { + if gui.GitCommand.WorkingTreeState() == "normal" { return gui.handleEscapeMerge(gui.g, gui.getMainView()) } // if there are no more files with merge conflicts, we should ask whether the user wants to continue |