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

Handle alternate merge conflict format; add tests

Browse Source
This commit is contained in:
Harrison Jones
2021-05-20 12:51:26 -04:00
committed by Jesse Duffield
parent 44f7fc6f7c
commit e478c254d4
2 changed files with 94 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/mergeconflicts/state.go
View File

@ -104,6 +104,10 @@ func findConflicts(content string) []*mergeConflict {
case "=======":
newConflict.middle = i
default:
// Sometimes these lines look like "<<<<<<< HEAD:foo/bar/baz.go" so handle that case as well.
if strings.HasPrefix(trimmedLine, "<<<<<<< HEAD:") {
newConflict = &mergeConflict{start: i}
}
if strings.HasPrefix(trimmedLine, ">>>>>>> ") {
newConflict.end = i
conflicts = append(conflicts, newConflict)