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

Add section headers for rebase todos, cherry-picks, reverts, and actual commits

Browse Source
This commit is contained in:
Stefan Haller
2025-04-04 18:26:33 +02:00
parent 98c19feccf
commit 6cbc1e0ace
46 changed files with 231 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/integration/tests/commit/revert_with_conflict_multiple_commits.go
View File

@ -44,8 +44,10 @@ var RevertWithConflictMultipleCommits = NewIntegrationTest(NewIntegrationTestArg
Confirm()
}).
Lines(
Contains("--- Pending reverts ---"),
Contains("revert").Contains("CI unrelated change"),
Contains("revert").Contains("CI <-- CONFLICT --- add first line"),
Contains("--- Commits ---"),
Contains("CI ◯ add second line"),
Contains("CI ◯ add first line"),
Contains("CI ◯ unrelated change"),