summaryrefslogtreecommitdiffstats
path: root/pkg/integration
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/integration')
-rw-r--r--pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go b/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go
index f767ba3a0..74dd34b3e 100644
--- a/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go
+++ b/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go
@@ -55,8 +55,7 @@ var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
t.ExpectPopup().Alert().
Title(Equals("Error")).
- Content(Contains("Applied patch to 'file1' with conflicts.").
- Contains("Applied patch to 'file2' cleanly.")).
+ Content(Contains("Applied patch to 'file1' with conflicts.")).
Confirm()
t.Views().Files().