summaryrefslogtreecommitdiffstats
path: root/pkg/gui/merge_panel.go
AgeCommit message (Expand)Author
2018-08-28dont panic when catting directoriesJesse Duffield
2018-08-16Fixed comment on issue #137 from @jesseduffieldMark Kopenga
2018-08-15Added translation for pkg/gui/ confirmation_panel.go gui.go merge_panel.goMark Kopenga
2018-08-14tried to update to latest masterMark Kopenga