sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-20 17:22:23 +03:00
Code Activity
Files
95e5ed6f47c9d34d45b1292e190abe0163bcafab
lazygit/pkg/gui/controllers/merge_conflicts_controller.go
Krystof Gartner 703f053a7e Add merge options menu 
Replace merge-tool with merge options menu that allows resolving all
conflicts for selected files as ours, theirs, or union, while still
providing access to the merge tool.
2025-10-09 08:45:58 +02:00

9.5 KiB
Raw Blame History

View Raw
View Git Blame Copy Permalink