diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-03-21 15:44:10 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-03-30 21:57:00 +1100 |
| commit | 9e67f74ca32d4422df13bc1ffeb1e7d639c11639 (patch) | |
| tree | d71abae9157c01d955b2f7fab6d8453aecc54c4d /pkg/i18n | |
| parent | e3ddfbf2b84da0e767ac02be721dcd8155b6143f (diff) | |
prevent staging directory containing files with inline merge conflicts
Diffstat (limited to 'pkg/i18n')
| -rw-r--r-- | pkg/i18n/english.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 6d7601144..f2211f8b1 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -437,6 +437,7 @@ type TranslationSet struct { CommitMessageCopiedToClipboard string LcCopiedToClipboard string ErrCannotEditDirectory string + ErrStageDirWithInlineMergeConflicts string } const englishReleaseNotes = `## lazygit 0.26 Release Notes @@ -997,5 +998,6 @@ func englishTranslationSet() TranslationSet { CommitMessageCopiedToClipboard: "Commit message copied to clipboard", LcCopiedToClipboard: "copied to clipboard", ErrCannotEditDirectory: "Cannot edit directory: you can only edit individual files", + ErrStageDirWithInlineMergeConflicts: "Cannot stage/unstage directory containing files with inline merge conflicts. Please fix up the merge conflicts first", } } |