Stefan Haller ff465e2581 Show original todo action instead of "conflict", and show <-- CONFLICT instead ... It is useful to see if the conflicted commit was a "pick" or an "edit". What's more, we're about to add support for showing cherry-picks and reverts, and seeing that a conflicted commit was a revert is important because its diff is backwards compared to the diff of the conflicting files in the Files panel.		2025-04-20 15:55:44 +02:00
..
translations	Update translation files from crowdin	2025-04-10 11:40:55 +02:00
english.go	Show original todo action instead of "conflict", and show <-- CONFLICT instead	2025-04-20 15:55:44 +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