Fix default merge style (#20564)#20565

wxiaoguang merged 1 commit intogo-gitea:release/v1.17go-gitea/gitea:release/v1.17from

wxiaoguang:backport-default-merge-stylewxiaoguang/gitea:backport-default-merge-styleCopy head branch name to clipboard