From cddf056f4d88e23ba7c2aa2263b9a2b1608ff651 Mon Sep 17 00:00:00 2001
From: Stefan Haller <stefan@haller-berlin.de>
Date: Fri, 3 Mar 2023 15:44:11 +0100
Subject: [PATCH] Extend test to expect what commits we want to be listed when
 there's a conflict

---
 pkg/integration/tests/interactive_rebase/shared.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkg/integration/tests/interactive_rebase/shared.go b/pkg/integration/tests/interactive_rebase/shared.go
index db45f42e3..2d3746af4 100644
--- a/pkg/integration/tests/interactive_rebase/shared.go
+++ b/pkg/integration/tests/interactive_rebase/shared.go
@@ -7,6 +7,13 @@ import (
 func handleConflictsFromSwap(t *TestDriver) {
 	t.Common().AcknowledgeConflicts()
 
+	t.Views().Commits().
+		Lines(
+			Contains("pick").Contains("commit two"),
+			// Would be nice to see "three" here, it's the one that conflicted
+			Contains("<-- YOU ARE HERE --- commit one"),
+		)
+
 	t.Views().Files().
 		IsFocused().
 		Lines(