Stefan Haller afe4d14106 Resolve submodule conflicts through a picker ... When both sides of a merge moved a submodule's gitlink, git reports it as "UU". Pressing space used to fall into the submodule no-op guard and pop the confusing "Nothing to stage..." error, and enter just entered the submodule, which does nothing to resolve the superproject conflict. Treat a conflicted submodule like the other non-textual conflicts: both space and enter now open a picker offering the two candidate commits, "current" and "incoming", each labelled with its summary. `git checkout --ours/--theirs` is a no-op on gitlinks, so we resolve by checking the submodule out at the chosen commit and staging it. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>		2026-06-28 16:12:36 +02:00
..
translations	Update translations from Crowdin	2026-05-26 22:08:49 +02:00
english.go	Resolve submodule conflicts through a picker	2026-06-28 16:12:36 +02:00
i18n.go	Modernize all codes	2025-11-15 10:46:23 +01:00
i18n_test.go	Clear LC_* env vars when running LANG tests	2026-05-01 08:13:52 +02:00