Ensure that all unmerged files are merged when conflict checking (#20528)#20536

Merged

6543 merged 2 commits intogo-gitea:release/v1.17from 6543-forks:backport-20528

Jul 29, 2022

+27-2

Commits on Jul 29, 2022

Ensure that all unmerged files are merged when conflict checking (go-gitea#20528 )

zeripath
authored and
6543
committed
Merge branch 'release/v1.17' into backport-20528
zeripath
authored