mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 20:36:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
lazygit/pkg/integration/tests/conflicts
History
Stefan Haller ebb576feac Provide conflict resolution dialogs for non-textual conflicts
2025-04-09 10:27:57 +02:00
..
filter.go Add a root item ("/") if files at top level have changed 2025-03-21 08:04:58 +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 Add a root item ("/") if files at top level have changed 2025-03-21 08:04:58 +01:00
resolve_no_auto_stage.go Add a root item ("/") if files at top level have changed 2025-03-21 08:04:58 +01:00
resolve_non_textual_conflicts.go Provide conflict resolution dialogs for non-textual conflicts 2025-04-09 10:27:57 +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