summaryrefslogtreecommitdiffstats
path: root/pkg/gui/controllers/merge_conflicts_controller.go
AgeCommit message (Expand)Author
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