summaryrefslogtreecommitdiffstats
path: root/merge_panel.go
AgeCommit message (Expand)Author
2018-08-09switch to using the log package rather than directly writing to fileJesse Duffield
2018-08-07support more merge conflict headersJesse Duffield
2018-08-07support Updated upstream message in merge panelJesse Duffield
2018-07-22update optionsJesse Duffield
2018-07-21better handling of merge conflictsJesse Duffield
2018-07-21merge with developJesse Duffield
2018-07-21fix up code that was used to test this very application (yes I'm ashamed)Jesse Duffield
2018-06-10this will cause a conflictJesse Duffield
2018-06-10scroll to merge conflictJesse Duffield
2018-06-09add support for mergingJesse Duffield
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 11:42:44 +0000