lazygit/pkg/integration/tests/conflicts
Stefan Haller 2f4cedd025 Show current files filter as radio buttons
I renamed the "Reset filter" item to "No filter" to make it look more like a
state than an action, so that it fits the radio button concept better.

When there are conflicts and we set the filter to show only conflicting files,
then none of the radio buttons light up, which is slightly strange. I guess it's
ok though.
2025-02-07 09:24:24 +01:00
..
filter.go Show current files filter as radio buttons 2025-02-07 09:24:24 +01:00
resolve_externally.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
resolve_multiple_files.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
resolve_no_auto_stage.go Add config git.autoStageResolvedConflicts 2024-09-02 18:12:47 +02:00
resolve_without_trailing_lf.go Fix ForEachLineInFile to not lose the last line if it doesn't end with a LF 2024-10-09 15:37:08 +02:00
undo_choose_hunk.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00