diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-26 01:20:19 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-26 14:50:47 +1100 |
| commit | c8cc18920f0b5ab54a19b9f7bdcf83db3210576f (patch) | |
| tree | 60623fbe5504469b9a4f4ca25a9a538b4eee52ce /pkg/gui/context_config.go | |
| parent | ce3bcfe37cf0c68f501fb09d543e9e212b0eaa61 (diff) | |
improve merge conflict flow
Diffstat (limited to 'pkg/gui/context_config.go')
| -rw-r--r-- | pkg/gui/context_config.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/context_config.go b/pkg/gui/context_config.go index 2b587a62e..2a152e517 100644 --- a/pkg/gui/context_config.go +++ b/pkg/gui/context_config.go @@ -167,7 +167,7 @@ func (gui *Gui) contextTree() ContextTree { Key: MAIN_PATCH_BUILDING_CONTEXT_KEY, }, Merging: &BasicContext{ - OnFocus: OnFocusWrapper(gui.refreshMergePanelWithLock), + OnFocus: OnFocusWrapper(gui.renderConflictsWithFocus), Kind: MAIN_CONTEXT, ViewName: "main", Key: MAIN_MERGING_CONTEXT_KEY, |