Jesse Duffield 9e67f74ca3 prevent staging directory containing files with inline merge conflicts

2021-03-30 21:57:00 +11:00

..

dutch.go

update wording

2021-03-30 21:57:00 +11:00

english.go

prevent staging directory containing files with inline merge conflicts

2021-03-30 21:57:00 +11:00

i18n_test.go

fix lint errors

2020-11-18 08:36:19 +11:00

i18n.go

type i18n

2020-10-10 00:23:01 +11:00

polish.go

update wording

2021-03-30 21:57:00 +11:00