mergeconflicts

package
v0.27.3 Latest Latest
Warning

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

 Go to latest Published: Apr 10, 2021 License: MIT Imports: 6 Imported by: 0

Documentation

Index

Constants

This section is empty.

Variables

This section is empty.

Functions

func ColoredConflictFile 

func ColoredConflictFile(content string, conflicts []commands.Conflict, conflictIndex int, conflictTop, hasFocus bool) string

func FindConflicts 

func FindConflicts(content string) []commands.Conflict

func IsIndexToDelete 

func IsIndexToDelete(i int, conflict commands.Conflict, selection Selection) bool

Types

type Selection 

type Selection int
const (
	TOP Selection = iota
	BOTTOM
	BOTH
)

Source Files

View all Source files

Jump to

Keyboard shortcuts

? : This menu
/ : Search site
f or F : Jump to
y or Y : Canonical URL
go.dev uses cookies from Google to deliver and enhance the quality of its services and to analyze traffic. Learn more.