mergeconflicts

Documentation

Index

• func ColoredConflictFile(content string, state *State, hasFocus bool) string
• type LineType
• type Selection
• type State
  • func NewState() *State
  • func (s *State) ContentAfterConflictResolve(path string, selection Selection) (bool, string, error)
  • func (s *State) GetConflictMiddle() int
  • func (s *State) IsFinalConflict() bool
  • func (s *State) NoConflicts() bool
  • func (s *State) PopFileSnapshot() (string, bool)
  • func (s *State) PushFileSnapshot(content string)
  • func (s *State) Reset()
  • func (s *State) SelectBottomOption()
  • func (s *State) SelectNextConflict()
  • func (s *State) SelectPrevConflict()
  • func (s *State) SelectTopOption()
  • func (s *State) Selection() Selection
  • func (s *State) SetConflictsFromCat(cat string)

Functions

func ColoredConflictFile

func ColoredConflictFile(content string, state *State, hasFocus bool) string

Types

type LineType

type LineType int

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

const (
	START LineType = iota
	MIDDLE
	END
	NOT_A_MARKER
)

type Selection

type Selection int

const (
	TOP Selection = iota
	BOTTOM
	BOTH
)

type State

type State struct {
	sync.Mutex

	EditHistory *stack.Stack
	// contains filtered or unexported fields
}

func NewState

func NewState() *State

func (*State) ContentAfterConflictResolve

func (s *State) ContentAfterConflictResolve(path string, selection Selection) (bool, string, error)

func (*State) GetConflictMiddle

func (s *State) GetConflictMiddle() int

func (*State) IsFinalConflict

func (s *State) IsFinalConflict() bool

func (*State) NoConflicts

func (s *State) NoConflicts() bool

func (*State) PopFileSnapshot

func (s *State) PopFileSnapshot() (string, bool)

func (*State) PushFileSnapshot

func (s *State) PushFileSnapshot(content string)

func (*State) Reset

func (s *State) Reset()

func (*State) SelectBottomOption

func (s *State) SelectBottomOption()

func (*State) SelectNextConflict

func (s *State) SelectNextConflict()

func (*State) SelectPrevConflict

func (s *State) SelectPrevConflict()

func (*State) SelectTopOption

func (s *State) SelectTopOption()

func (*State) Selection

func (s *State) Selection() Selection

func (*State) SetConflictsFromCat

func (s *State) SetConflictsFromCat(cat string)