diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-05 11:53:01 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-05 19:22:01 +1100 |
| commit | 0ffccbd3ee952a441575f378ce70b8be94e9f3c5 (patch) | |
| tree | 328525fdcdc9615fe95ada5399f7814d3c7565ce /pkg/i18n/english.go | |
| parent | 1fc120de2d4a28b976920cd3ac5393bf4c040705 (diff) | |
checks for if we're in a normal working tree state
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 d5f46ac2d..5d5bb5cc4 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -801,6 +801,9 @@ func addEnglish(i18nObject *i18n.Bundle) error { ID: "DiscardPatchConfirm", Other: "You can only build a patch from one commit at a time. Discard current patch?", }, &i18n.Message{ + ID: "CantPatchWhileRebasingError", + Other: "You cannot build a patch or run patch commands while in a merging or rebasing state", + }, &i18n.Message{ ID: "toggleAddToPatch", Other: "toggle file included in patch", }, &i18n.Message{ |