diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-26 01:20:19 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-26 14:50:47 +1100 |
| commit | c8cc18920f0b5ab54a19b9f7bdcf83db3210576f (patch) | |
| tree | 60623fbe5504469b9a4f4ca25a9a538b4eee52ce /pkg/i18n | |
| parent | ce3bcfe37cf0c68f501fb09d543e9e212b0eaa61 (diff) | |
improve merge conflict flow
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 5f03881a6..db3cd112c 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -507,6 +507,7 @@ type Actions struct { DiscardAllChangesInFile string DiscardAllUnstagedChangesInFile string StageFile string + StageResolvedFiles string UnstageFile string UnstageAllFiles string StageAllFiles string @@ -1064,6 +1065,7 @@ func EnglishTranslationSet() TranslationSet { DiscardAllChangesInFile: "Discard all changes in file", DiscardAllUnstagedChangesInFile: "Discard all unstaged changes in file", StageFile: "Stage file", + StageResolvedFiles: "Stage files whose merge conflicts were resolved", UnstageFile: "Unstage file", UnstageAllFiles: "Unstage all files", StageAllFiles: "Stage all files", |