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
..
translations	Update translations from crowdin	2025-09-05 10:47:51 +02:00
english.go	Add merge options menu	2025-10-09 08:45:58 +02:00
i18n.go	Use dario.cat/mergo instead of github.com/imdario/mergo	2025-04-09 11:23:55 +02:00
i18n_test.go	Fix language auto-detection	2024-07-13 12:07:59 +02:00