diff options
Diffstat (limited to 'pkg/i18n/english.go')
-rw-r--r-- | pkg/i18n/english.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 733325540..b6c8215d8 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -509,7 +509,7 @@ func addEnglish(i18nObject *i18n.Bundle) error { Other: "fetching and fast-forwarding {{.from}} -> {{.to}} ...", }, &i18n.Message{ ID: "FoundConflicts", - Other: "Damn, conflicts! To abort press 'esc', otherwise press 'enter'", + Other: "Conflicts! To abort press 'esc', otherwise press 'enter'", }, &i18n.Message{ ID: "FoundConflictsTitle", Other: "Auto-merge failed", |