summaryrefslogtreecommitdiffstats
path: root/pkg/gui/mergeconflicts
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-05-07 15:42:36 +1000
committerJesse Duffield <jessedduffield@gmail.com>2022-05-07 16:02:04 +1000
commit3bf0c9ef441f9343172ed71b5e5947c69e66ac9a (patch)
treeba2aace32d469336eed58c8a988ef95c2061240e /pkg/gui/mergeconflicts
parentcd5b041b0f8b95b473849d222b71aa2fe3b24899 (diff)
more documentation
Diffstat (limited to 'pkg/gui/mergeconflicts')
-rw-r--r--pkg/gui/mergeconflicts/state.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/gui/mergeconflicts/state.go b/pkg/gui/mergeconflicts/state.go
index 41a072617..83969a8eb 100644
--- a/pkg/gui/mergeconflicts/state.go
+++ b/pkg/gui/mergeconflicts/state.go
@@ -6,6 +6,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/utils"
)
+// State represents the selection state of the merge conflict context.
type State struct {
sync.Mutex