mirror of
https://gitee.com/gitea/gitea
synced 2026-01-03 22:26:36 +08:00
* Only show conflicted files if not merged * try again Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com> Co-authored-by: techknowlogick <matti@mdranta.net>