sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

refactor merge panel

Browse Source
This commit is contained in:
Jesse Duffield
2021-04-18 18:07:10 +10:00
parent e73de332a1
commit 98375dc902
7 changed files with 287 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/commands/git_structs.go
View File

@ -1,9 +0,0 @@
package commands
// Conflict : A git conflict with a start middle and end corresponding to line
// numbers in the file where the conflict bars appear
type Conflict struct {
Start int
Middle int
End int
}