Add merge files files to GetCommitFileStatus#20515

Merged

lunny merged 6 commits intogo-gitea:mainfrom

dontnod:dontnod_diffmerges_for_api_commits

Aug 24, 2023

Commits on May 14, 2023

Commits on Jul 14, 2023

Merge remote-tracking branch 'origin/main' into fix/GetCommitFileStatus/merges
tdesveaux
committed

Commits on Aug 3, 2023

Merge remote-tracking branch 'origin/main' into fix/GetCommitFileStatus/merges
tdesveaux
committed

Commits on Aug 24, 2023