diff options
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 7ee1c147d..331feee38 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -498,6 +498,9 @@ func addEnglish(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "RebaseOptionsTitle", Other: "Rebase Options", + }, &i18n.Message{ + ID: "ConflictsResolved", + Other: "all merge conflicts resolved. Continue?", }, ) } |