go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-03 00:57:52 +02:00
Code Issues Releases Activity

Show todos (and conflicting commit) for cherry-pick and revert

Browse Source
This commit is contained in:
Stefan Haller
2024-06-11 15:22:35 +02:00
parent 687bae48ed
commit bb4d03db1f
6 changed files with 426 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/integration/tests/commit/revert_with_conflict_single_commit.go
View File

@ -39,16 +39,10 @@ var RevertWithConflictSingleCommit = NewIntegrationTest(NewIntegrationTestArgs{
Confirm()
}).
Lines(
/* EXPECTED:
Proper display of revert commits is not implemented yet; we'll do this in the next PR
Contains("revert").Contains("CI <-- CONFLICT --- add first line"),
Contains("CI ◯ add second line"),
Contains("CI ◯ add first line"),
Contains("CI ◯ add empty file"),
ACTUAL: */
Contains("CI ◯ <-- YOU ARE HERE --- add second line"),
Contains("CI ◯ add first line"),
Contains("CI ◯ add empty file"),
)
t.Views().Options().Content(Contains("View revert options: m"))