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

Show confirmation menu when trying to amend changes while there are conflicts

Browse Source
This commit is contained in:
Stefan Haller
2025-01-28 18:29:38 +01:00
parent c0e3922d02
commit 0a78d0016e
8 changed files with 269 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/integration/tests/test_list.go
View File

@ -83,6 +83,9 @@ var tests = []*components.IntegrationTest{
commit.AddCoAuthorRange,
commit.AddCoAuthorWhileCommitting,
commit.Amend,
commit.AmendWhenThereAreConflictsAndAmend,
commit.AmendWhenThereAreConflictsAndCancel,
commit.AmendWhenThereAreConflictsAndContinue,
commit.AutoWrapMessage,
commit.Checkout,
commit.Commit,