From fd38ad809606bda7dfb820a0c2a56e2aaa0f87bd Mon Sep 17 00:00:00 2001
From: Cristian Betivu <cbe@languagewire.com>
Date: Sun, 30 May 2021 12:42:06 +0200
Subject: [PATCH] More generic merge conflict detection

---
 pkg/gui/mergeconflicts/state_test.go | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkg/gui/mergeconflicts/state_test.go b/pkg/gui/mergeconflicts/state_test.go
index df2e077b4..442265fb6 100644
--- a/pkg/gui/mergeconflicts/state_test.go
+++ b/pkg/gui/mergeconflicts/state_test.go
@@ -51,6 +51,13 @@ foo
 ++=======
 bar
 ++>>>>>>> branch
+
+<<<<<<< Updated upstream: foo/bar/baz.go
+foo
+bar
+=======
+baz
+>>>>>>> branch
 `,
 			expected: []*mergeConflict{
 				{
@@ -78,6 +85,11 @@ bar
 					middle: 27,
 					end:    29,
 				},
+				{
+					start:  31,
+					middle: 34,
+					end:    36,
+				},
 			},
 		},
 	}