sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-23 16:22:24 +03:00
Code Activity
Files
c30d04d40d509bbdcdb07cc10ed4825c1bd259e8
lazygit/pkg/integration/tests/shared/conflicts.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

4.1 KiB
Raw Blame History

View Raw
View Git Blame Copy Permalink