summaryrefslogtreecommitdiffstats
path: root/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/integration/tests/sync/pull_rebase_interactive_conflict.go')
-rw-r--r--pkg/integration/tests/sync/pull_rebase_interactive_conflict.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go b/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go
index a6a3f5356..e93ca2e37 100644
--- a/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go
+++ b/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go
@@ -38,7 +38,7 @@ var PullRebaseInteractiveConflict = NewIntegrationTest(NewIntegrationTestArgs{
Contains("one"),
)
- t.Views().Status().Content(Contains("↓2 repo → master"))
+ t.Views().Status().Content(Equals("↑2↓2 repo → master"))
t.Views().Files().
IsFocused().
@@ -76,7 +76,7 @@ var PullRebaseInteractiveConflict = NewIntegrationTest(NewIntegrationTestArgs{
t.Common().ContinueOnConflictsResolved()
- t.Views().Status().Content(Contains("↑2 repo → master"))
+ t.Views().Status().Content(Equals("↑2 repo → master"))
t.Views().Commits().
Focus().