go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-13 00:07:59 +02:00
Code Issues Releases Activity

support Updated upstream message in merge panel

Browse Source
This commit is contained in:
Jesse Duffield 2018-08-07 10:39:49 +10:00
parent f11edda6a2
commit 236eabb811
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
merge_panel.go
View File

@ -18,7 +18,7 @@ func findConflicts(content string) ([]conflict, error) {
conflicts := make([]conflict, 0) conflicts := make([]conflict, 0)
var newConflict conflict var newConflict conflict
for i, line := range splitLines(content) { for i, line := range splitLines(content) {
if line == "<<<<<<< HEAD" { if line == "<<<<<<< HEAD" || line == "<<<<<<< Updated upstream" {
newConflict = conflict{start: i} newConflict = conflict{start: i}
} else if line == "=======" { } else if line == "=======" {
newConflict.middle = i newConflict.middle = i