mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 20:36:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

rename merging context to mergeConflicts

Browse source
This commit is contained in:
Jesse Duffield 2022-08-06 18:05:00 +10:00
parent cd2c01d1cf
commit 445a625b56
16 changed files with 215 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/cheatsheet/generate.go
View file

@ -106,7 +106,7 @@ func localisedTitle(tr *i18n.TranslationSet, str string) string {
"information": tr.InformationTitle,
"main": tr.NormalTitle,
"patchBuilding": tr.PatchBuildingTitle,
"merging": tr.MergingTitle,
"mergeConflicts": tr.MergingTitle,
"staging": tr.StagingTitle,
"menu": tr.MenuTitle,
"search": tr.SearchTitle,