From 037e9572825eb1e506d9f503831622fbc9e6edbf Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sat, 25 Feb 2023 11:39:24 +1100
Subject: [PATCH] fix PullMergeConflict integration test

---
 pkg/gui/controllers/helpers/merge_and_rebase_helper.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
index 21c02d6f4..b70f7b2ed 100644
--- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
+++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
@@ -119,6 +119,7 @@ var conflictStrings = []string{
 	"When you have resolved this problem",
 	"fix conflicts",
 	"Resolve all conflicts manually",
+	"Merge conflict in file",
 }
 
 func isMergeConflictErr(errStr string) bool {