diff

package
v0.0.0-...-29b2579 Latest Latest
Warning

This package is not in the latest version of its module.

Go to latest
Published: Oct 29, 2025 License: AGPL-3.0 Imports: 1 Imported by: 0

Documentation

Index

Constants

This section is empty.

Variables

This section is empty.

Functions

func CountAddedLines

func CountAddedLines(text string) int

func ParseConflictsAndCountLines

func ParseConflictsAndCountLines(text string) []int

Types

type ConflictBlock

type ConflictBlock struct {
	OursContent   []string
	TheirsContent []string
	StartLine     int
	EndLine       int
}

func (*ConflictBlock) CountAddedLinesInConflict

func (cb *ConflictBlock) CountAddedLinesInConflict() int

func (*ConflictBlock) CountNetAddedLines

func (cb *ConflictBlock) CountNetAddedLines() int

type ConflictParser

type ConflictParser struct {
	// contains filtered or unexported fields
}

func NewConflictParser

func NewConflictParser(text string) *ConflictParser

func (*ConflictParser) ParseConflicts

func (p *ConflictParser) ParseConflicts() []ConflictBlock

Jump to

Keyboard shortcuts

? : This menu
/ : Search site
f or F : Jump to
y or Y : Canonical URL