From 236eabb8116b453ae8d3ef10dc8286b49210fe16 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Aug 2018 10:39:49 +1000
Subject: [PATCH] support Updated upstream message in merge panel

---
 merge_panel.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merge_panel.go b/merge_panel.go
index 7b595b393..e7681993c 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" {
+		if line == "<<<<<<< HEAD" || line == "<<<<<<< Updated upstream" {
 			newConflict = conflict{start: i}
 		} else if line == "=======" {
 			newConflict.middle = i