mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-08-09 09:22:48 +03:00
Add section headers for rebase todos, cherry-picks, reverts, and actual commits
This commit is contained in:
@@ -9,8 +9,10 @@ func handleConflictsFromSwap(t *TestDriver, expectedCommand string) {
|
||||
|
||||
t.Views().Commits().
|
||||
Lines(
|
||||
Contains("--- Pending rebase todos ---"),
|
||||
Contains("pick").Contains("commit two"),
|
||||
Contains(expectedCommand).Contains("<-- CONFLICT --- commit three"),
|
||||
Contains("--- Commits ---"),
|
||||
Contains("commit one"),
|
||||
)
|
||||
|
||||
|
Reference in New Issue
Block a user