diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-08-06 18:05:00 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-08-06 18:05:00 +1000 |
| commit | 445a625b56a79be6cee7ec1ee35fe9f4fcc2daad (patch) | |
| tree | 1258e2bb1f5f486c109b9150e0805ded0d2fac90 /pkg/gui/main_panels.go | |
| parent | cd2c01d1cfb0236ccb7c94a8aae21726ef1283d1 (diff) | |
rename merging context to mergeConflicts
Diffstat (limited to 'pkg/gui/main_panels.go')
| -rw-r--r-- | pkg/gui/main_panels.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/main_panels.go b/pkg/gui/main_panels.go index ea9bfc3b3..f26ba42fd 100644 --- a/pkg/gui/main_panels.go +++ b/pkg/gui/main_panels.go @@ -144,7 +144,7 @@ func (gui *Gui) patchBuildingMainContextPair() MainContextPair { func (gui *Gui) mergingMainContextPair() MainContextPair { return MainContextPair{ - main: gui.State.Contexts.Merging, + main: gui.State.Contexts.MergeConflicts, secondary: nil, } } |