//
pkg.gl
Category
github.com/jesseduffield/lazygit
pkg
gui
mergeconflicts
package
0.48.0
Repository:
https://github.com/jesseduffield/lazygit.git
Documentation:
pkg.go.dev
Versions
1
Dependencies
8
Dependents
4
Files
380 SLOC
#
Functions
ColoredConflictFile
FileHasConflictMarkers
tells us whether a file actually has inline merge conflicts.
NewState
#
Constants
ALL
ANCESTOR
BOTTOM
END
MIDDLE
NOT_A_MARKER
START
TARGET
TOP
#
Variables
CONFLICT_END
CONFLICT_END_BYTES
CONFLICT_START
CONFLICT_START_BYTES
#
Structs
State
State represents the selection state of the merge conflict context.
#
Type aliases
LineType
LineType tells us whether a given line is a start/middle/end marker of a conflict, or if it's not a marker at all.
Selection