diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-12 21:24:01 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-14 22:22:47 +1100 |
| commit | 7995d56a858fdeb399ed884a6983008aa2089cfb (patch) | |
| tree | 3eee8bd6d332e262a61f7f025e6658a62a77c485 /pkg/i18n/english.go | |
| parent | 30aed94aa8451911fc1c5ba1e52ff28b180a8d31 (diff) | |
allow editing or opening a file while resolving merge conflicts
Diffstat (limited to 'pkg/i18n/english.go')
| -rw-r--r-- | pkg/i18n/english.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index b15f60bbb..ee53cc1b9 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -148,6 +148,9 @@ func addEnglish(i18nObject *i18n.Bundle) error { ID: "resolveMergeConflicts", Other: "resolve merge conflicts", }, &i18n.Message{ + ID: "MergeConflictsTitle", + Other: "Merge Conflicts", + }, &i18n.Message{ ID: "checkout", Other: "checkout", }, &i18n.Message{ |