diff options
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index db5cabf28..dafd03b24 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -195,7 +195,7 @@ func (gui *Gui) catSelectedFile() (string, error) { return "", errors.New(gui.Tr.NotAFile) } - cat, err := gui.GitCommand.File.Cat(item.Name) + cat, err := gui.Git.File.Cat(item.Name) if err != nil { gui.Log.Error(err) return "", err @@ -263,7 +263,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.GitCommand.Status.WorkingTreeState() == enums.REBASE_MODE_NONE { + if gui.Git.Status.WorkingTreeState() == enums.REBASE_MODE_NONE { return gui.handleEscapeMerge() } // if there are no more files with merge conflicts, we should ask whether the user wants to continue |