diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-28 19:12:35 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-08-28 19:12:35 +1000 |
| commit | 7e1e97d050dd38b08e0131776bf130bae1fb1a4c (patch) | |
| tree | ddf77f98afc9e005f7a739bef4ba1eb90448bc7b /pkg/gui/merge_panel.go | |
| parent | 320ccdb22afc89e7bd77695eafb262281b323095 (diff) | |
dont panic when catting directories
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 1efea16da..e3da82f3c 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -180,6 +180,9 @@ func (gui *Gui) refreshMergePanel(g *gocui.Gui) error { if err != nil { return err } + if cat == "" { + return nil + } gui.State.Conflicts, err = gui.findConflicts(cat) if err != nil { return err |