summaryrefslogtreecommitdiffstats
path: root/pkg/gui/controllers/merge_conflicts_controller.go
AgeCommit message (Expand)Author
2024-01-28Display more keybindings on-screenJesse Duffield
2024-01-28Show mode-specific keybinding suggestionsJesse Duffield
2024-01-28Improve keybinding descriptionsJesse Duffield
2024-01-19Enforce single-item selection in various actionsJesse Duffield
2024-01-19Standardise display of range selection across viewsJesse Duffield
2023-07-31Moves log related translations into its own Tr.Log. namespaceKarl Heitmann
2023-07-31Moves hard coded strings for LogCommand to i18n.Karl Heitmann
2023-05-25Use sentence case everywhereJesse Duffield
2023-04-30lots of changesJesse Duffield
2023-04-30standardise controller helper methodsJesse Duffield
2023-04-30lots more refactoringJesse Duffield
2023-04-30Begin refactoring guiJesse Duffield
2023-04-13Remove line number support for "open" commandStefan Haller
2023-03-09Remove alternative confirmation and return keymappingsLuka Markušić
2023-03-04Keep side context in context stack when pushing a main contextStefan Haller
2023-02-11chore: change to work `return-alt1` on all viewsRyooooooga
2022-09-17typojiepeng
2022-09-17remove deprecated callsjiepeng
2022-08-07move merge conflicts code into controllerJesse Duffield
2022-08-06rename merging context to mergeConflictsJesse Duffield
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-19 12:08:26 +0000