1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00

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

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

View File

@ -128,6 +128,7 @@ var tests = []*components.IntegrationTest{
commit.ResetAuthorRange,
commit.Revert,
commit.RevertMerge,
commit.RevertWithConflictMultipleCommits,
commit.RevertWithConflictSingleCommit,
commit.Reword,
commit.Search,
@ -262,6 +263,8 @@ var tests = []*components.IntegrationTest{
interactive_rebase.QuickStartKeepSelectionRange,
interactive_rebase.Rebase,
interactive_rebase.RebaseWithCommitThatBecomesEmpty,
interactive_rebase.RevertMultipleCommitsInInteractiveRebase,
interactive_rebase.RevertSingleCommitInInteractiveRebase,
interactive_rebase.RewordCommitWithEditorAndFail,
interactive_rebase.RewordFirstCommit,
interactive_rebase.RewordLastCommit,