Add warning message in merge instructions when `AutodetectManualMerge` was not enabled#31805

Merged

wolfogre merged 4 commits intogo-gitea:mainfrom a1012112796:zzc/dev/merg_warning

Aug 10, 2024

+10-1

Commits on Aug 8, 2024

Add warning message in merge instructions when AutodetectManualMerge was
a1012112796
committed

Commits on Aug 9, 2024

Commits on Aug 10, 2024

Merge branch 'main' into zzc/dev/merg_warning
GiteaBot
authored