diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-11-01 08:58:58 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-11-01 09:18:30 +1100 |
| commit | 927ee631061fbc3c86c4d73ac5056d8b4bd84c81 (patch) | |
| tree | 71ebb9353e9e085a91c529c90b0308bec4e645fb /pkg/gui/merge_panel.go | |
| parent | 9989c96321685ac3493642fb8e1fa511896175e3 (diff) | |
support aborting a merge or rebase with esc
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 9fcd475c8..c0c55de6c 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -285,7 +285,7 @@ func (gui *Gui) promptToContinueRebase() error { return err } - return gui.genericMergeCommand("continue") + return gui.genericMergeCommand(REBASE_OPTION_CONTINUE) }, handleClose: func() error { return gui.pushContext(gui.State.Contexts.Files) |