go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-29 22:48:24 +02:00
Code Issues Releases Activity
Files
80f860beb79b104b92608fd7c69bf0ce91be970d
lazygit/pkg/integration/tests/conflicts/merge_file_both.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

1.4 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink