sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code 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

4
pkg/integration/tests/interactive_rebase/amend_commit_with_conflict.go
View File

@ -34,8 +34,10 @@ var AmendCommitWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
t.Common().AcknowledgeConflicts()
}).
Lines(
Contains("--- Pending rebase todos ---"),
Contains("pick").Contains("three"),
Contains("fixup").Contains("<-- CONFLICT --- fixup! two"),
Contains("--- Commits ---"),
Contains("two"),
Contains("one"),
)
@ -66,7 +68,9 @@ var AmendCommitWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
t.Views().Commits().
Lines(
Contains("--- Pending rebase todos ---"),
Contains("<-- CONFLICT --- three"),
Contains("--- Commits ---"),
Contains("two"),
Contains("one"),
)