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

Provide conflict resolution dialogs for non-textual conflicts

Browse Source
This commit is contained in:
Stefan Haller
2025-03-27 15:31:45 +01:00
parent efcd71b296
commit ebb576feac
5 changed files with 168 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,6 +141,7 @@ var tests = []*components.IntegrationTest{
conflicts.ResolveExternally,
conflicts.ResolveMultipleFiles,
conflicts.ResolveNoAutoStage,
conflicts.ResolveNonTextualConflicts,
conflicts.ResolveWithoutTrailingLf,
conflicts.UndoChooseHunk,
custom_commands.AccessCommitProperties,