From ba9485ae57a47b68e1e315fe56bd6d2755e18a4d Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 7 Aug 2018 10:41:14 +1000 Subject: [PATCH] support more merge conflict headers --- merge_panel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge_panel.go b/merge_panel.go index e7681993c..54ff7c21d 100644 --- a/merge_panel.go +++ b/merge_panel.go @@ -18,7 +18,7 @@ func findConflicts(content string) ([]conflict, error) { conflicts := make([]conflict, 0) var newConflict conflict for i, line := range splitLines(content) { - if line == "<<<<<<< HEAD" || line == "<<<<<<< Updated upstream" { + if line == "<<<<<<< HEAD" || line == "<<<<<<< MERGE_HEAD" || line == "<<<<<<< Updated upstream" { newConflict = conflict{start: i} } else if line == "=======" { newConflict.middle = i