mirror of
https://github.com/go-gitea/gitea
synced 2025-02-21 19:42:01 +01: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>