diff options
Diffstat (limited to 'pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go')
| -rw-r--r-- | pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go index 6a9c47781..4095a563f 100644 --- a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go +++ b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go @@ -55,7 +55,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{ input.AcceptConfirmation(Equals("Auto-merge failed"), Contains("Conflicts!")) assert.CurrentViewName("files") - assert.SelectedLine(Contains("file")) + assert.CurrentLine(Contains("file")) // not using Confirm() convenience method because I suspect we might change this // keybinding to something more bespoke |