summaryrefslogtreecommitdiffstats
path: root/pkg/gui/controllers/helpers/merge_conflicts_helper.go
AgeCommit message (Expand)Author
2024-01-19Standardise display of range selection across viewsJesse Duffield
2023-05-16Fix race conditionJesse Duffield
2023-04-30standardise helper argsJesse Duffield
2023-04-30split context common from helper commonJesse Duffield
2023-04-30lots more refactoringJesse Duffield
2023-04-30Begin refactoring guiJesse Duffield
2022-08-07move merge conflicts code into controllerJesse Duffield