mirror of
https://github.com/go-gitea/gitea
synced 2025-01-22 02:57:43 +01:00
9789e0ad53
* 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>